Had the same problem with my hobie tank at the switch, had to scrape off the clear insulation and re-solder the corroded terminal switch had failed then marine gooped the heck out of it.
I'm going to try your suggestion about the intake as I am tired of it sucking up EVERY piece of eel grass in the ocean!!! You would think that a tank that cost $200 would be made a little better with a little more thought about it's potential for pulling in foreign material (eel grass)!