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

IMHO I have seen more "need help with my EZmessedup - DUNRIGHT - 23 and me - Painfull" aftermarket harnesses then any of the OEM stock style harness. plug and play!