Sometimes it's easier to simply replace a hacked up harness with a new one such as this:
You could ask the seller if he includes instructions. I believe the wires are already cut to length and zip tied much the same as the original harness. So it should basically "lay" right into place.
Great to see you're enjoying Pinside! Did you know Pinside is able to run thanks to donations from our visitors? Please donate to Pinside, support the site and get anext to your username to show for it! Donate to Pinside