Sounds like you need to throw the wiring harness in the bin and find a decent harness to me. The last butcher has gone a bit far.