The only thing i wonder is, if you had to hack the harness b/c of the PO's idiocy. Won't rebuilding the oem harness from scratch nickel and dime you to the point of costing more than a new universal harness. You'll be amazed how much wiring and connectors will add up.
I mean an inexpensive universal harness is only 150 bucks