Above all else please do all this outside away from any kind of sparks. All these ideas will work. If you have rust and clean it out you might check local motor cycle shops for tank sealer.they usually reseal their tanks after cleang to keep out rust.