Doing all that modification and repairing others mods is really time consuming. Been, there done that. When I got my '66 Chevelle it had a late model Gen V engine and the owner had rewired the entire engine and headlight wiring with ONE roll of Red wire....

I still have over 20 ft of it. It comes in handy for splices and other things...

I was online this morning looking at AAW for a complete "update" kit for my Camaro... what a friggen shock ! The prices have gone up a lot since the last kit I bought and since mine is an rs car, that harness is a separate purchase with an additional cost of $200. Gonna cost about $1,200 for complete system.
Glad you were able to save some of what you have.