I would have a look at the original wiring by removing the tape on the harness right back to the switch. You may find one bad connection or a bent pin on a connector that can easily be repaired as opposed to trying to rewire the complete assembly and maintain some sort of decent looking wiring harness. Just my $.02
