If you work faster than I do, it may already be too late for my suggestion.
I don't have good input on one supplier of wiring harness compared to another but if the old harness is in any sort of condition (i.e. not ripped to bits) take many photos of it before ripping it out to show how it was routed, where wires approached components from and how it was secured. I keep finding I need an image to help my memory.
