Alex - quite the electrical refit! Suggestion - get rid of the wire nuts and install terminal boards with lugs crimped on the wires. ABYC E-11 doesn't allow the use of wire nuts on a boat due to potential vibration and corrosion problems.
188.8.131.52 - "Terminal connectors shall be the ring or captive spade types."
184.108.40.206 - "Twist on connectors, i.e., wire nuts, shall not be used."