Stop in for a cup of coffee

fair enough. So just to make sure I'm understanding your suggestion, are you saying to lay out the factory harness, buy the needed connectors,ends, plugs etc and get the same color wires and custom make a harness using the original as a pattern?

I like to rewire inside the car so I know how everything fits and can get the wire lengths more accurate...

Out of the car on a board may let you make more errors...