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

If you want a factory look you are going to have to buy a "repop" harness. Either that or rebuild yours which can be done. Most all the connector terminals can be had, and if the plastic connector shells are not all broke/ melted or otherwise damaged you can re-use them