100% agreed on re-wiring the whole thing and putting in a fuse block in there. Very easy to do and very easy to isolate problems from there, and knowing you have the added protection of fuses.
Having reliable electrical systems on the water is a safety issue and is cheap insurance as far as I'm concerned.
I ordered a blue sea fuse block (they come in 4,6, 8, 12 etc... blocks to isolate each electrical item you have from lights, to bilge pumps, to fish finders, radios, dash board, etc... so it's a good idea to get one that has a few "extra" poles so you can quickly and easily add these things on.
https://www.amazon.ca/Blue-Sea-Syste...32363535&psc=1
All you need to do is run main power up to box (from battery), wire it through either a master power switch (which is what I prefer) or run it through the ignition.
From there, run all your stuff to the box to it's own dedicated circuit.
If someone like me can do it, anyone can !!!! (I'm not that smart).
Let me know if you need any more instructions or anything - pretty easy to do really.