I think its time to give in and buy a new wiring harness

if you want the best out there right now its the american auto wire classic update. not original looking but its the best.

you want original then go M&H from year one.