Since you have a battery leakage problem too I'd recommend cleanup, repair, and checkout of proper operation before wrapping up the switch and connector issues. If there's fatal damage from the battery, that changes the picture for the rest. Good luck.
?
Ed
