Right on Andy!!! Boat and trailer wiring can be such a pain in the a$$!! The one thing that I would add is to use a good quality fuse box. Our boat came with one installed and we added another one, well the one we added got replaced last summer by our mechanic as it was giving us problems with intermitent power and the likes. Live and learn eh!?!!?
Good luck and tight lines, Jeff laugh laugh