Hi I realized this was an old thread, but I figured I chime in for these types of problems will be around as long as electrons flow..
I can help you out if you run into an electrical issue again in the future or anyone else.
Ive been working on boats and specialize in marine electrical and related systems for nearly 20 years. Ive worked for a number of high-end custom yacht builders, am ABYC trained and love wires.
Formerly from blue water, I am here in the lakes region on fresh water as a change. You guys have it easy without a doubt. The corrosion is minimal which is great in every way.
Anyhow, consider my offer. Shoot me a question. Keep power on and make it look neat