I’d be inclined to remove all wiring and start from scratch with some good, non-soy based (critters don’t eat it) insulated wiring and build my own looms. It definitely isn’t that complicated and the circuits should be relatively easy to build from the wiring diagram you got from Messick’s.