Yeah, okay...
So the only problem was that the repair shop had swapped the wire harnesses. In my frustration I turned a simple 20 minute job into over an hour of confusion. Anyway, everything works fine now and I can finally close this chapter. Thanks to Dokta and everyone else for the help!