Several companies, Loctite is one, make a spray that stops surface rust like you're describing and converts it into a paintable surface. I've used on the sheet metal parts of a BBQ with success. It dries black so that's how I left it.
"Il Travato Rosso"
2015 Travato 59g