I recently discovered Slimy Grimy for getting rid of rust in tanks. It works great and won’t hurt the paint.