Check with a Yamaha dealer. They make an easy to use derusting solution that's not too espensive at about $11, at least locally.
I've read an evaluation somewhere that said it worked well and left a rest resistant coating.
This is NOT to be confused with Kreem, a tank lining chemical system that uses three different liquids to clean, dry and coat the tank internal surfaces.