Deconstructing the stock harness sounds like a bear but also would be nice and clean.
Reconstructed a harness once, because I figured it'd be easy to save big bucks and any monkey could do it. Well, THIS monkey should've stayed in the tree playing with himself, as it took a longtime spread out on the garage floor. I used to live off 21st and California, with those super narrow, 9ft wide 3 car garages. I'll never do it again!
A take away is this; use a 4x8 sheet of plywood to tack up the old harness to methodically label end components, unpeel and see the wire gauge, terminal ends, junctions, and colors easier. Rebuild the new harness following the physical schematic that's now tacked on the board...easy-peasy, any monkey could do this! Cheers