Naval Jelly is good for removing rust. As far as the other part of your question, sorry but I'm just getting into framebuilding myself so I don't have an answer.