is there a good replacement or other solution?
As I was reading the comments regarding "simple boats" and electrical fires, I was thinking "turn off the power at the switch..." but seems the switch is likely the source. That no doubt means fire right at the batteries.