I would suggest that you look at Brush Alocrom 1200. This will remove light corrosion and provide a good chromate key for paint.
Brush Alocrom 1200 Kits.
Alochrom is the standard chromate finish used throughout the metal finishing world in which I spent far too much of my life.