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

There’s also a lot of extra wire left over, so, you could just make a pigtail out of new wire and use the factory connector.

thats what i did when i out the AAW highway 22 in my yellow dart. just rebuilt the stock plastic connector. like ya said we had a ton of extra wire and connectors to do so.