With regards to the wire harness, I would consider ordering a new one from SKIDIM and just be done with it.