Jason

Relocating the switch is a good idea, then you can ford small bodies of water without frying the tank.

Rocketman

Many people like to make a charging switch access for the tanks to avoid dismantling the tank. There is a schematic and examples on the SEAD site:
www.sead.us/technology4.html

Although done with Tamiya tanks the same principle holds for other battery operated tanks.