Have rubbed down and painted again, and again, and I seem to be getting there.
Mostly it is that the first coat of white on grey looks really really patchy until it dries. When the second coat is on and dry all is good. There will still be some spots of grease showing through. I might get some tippex.