Thank you for the excellent write-up on this. I wouldn't have thought to trace out the whole harness, but if you're going to do a job right...
I went to the McMasters-Carr website and was overwhelmed at the variety of wire available there. You wouldn't happen to have the item numbers and length of wire you purchased available? They say imitation is the finest form of flattery.