I highly recommend a new harness if you have any plans on keeping that chassis for long term...patching a harness is a never ending process and if the right shorts start popping ECU circuitries, you will be in Hell,never mind the $$$$$$$$ you will cost yourself in the long run.
These harness were made with bio-degradable insulation and they will degrade with time, no matter what you do short of replacement to the new, modified harness.
I am starting to see these newer style harness pop up on ebay from time to time b/c junkers are aware when they have a partser come in if it has the up-graded harness already done ..they know there is a market for such and I see them in the $100 backet there...worth a check and inquire to the lister to see if they know for sure. [ in the event you do not want to go for a new one..they are not cheap]..