I would recommend Ospho in place of the vinegar. Ospho causes a chemical reaction and then stops. Vinegar doesn't know when to stop.
I don't know what to recommend to put on after you kill the rust. This information seems to be held tighter than tips to locate morel mushrooms and wild black raspberry patches, and BBQ recipes around here.
