Good job mate, I tried doing the same to one of my MR2s and it all went haywire. The eBay sockets I bought weren't consistent, each one had three coloured wires (red, green, black) but on every socket, they all were used differently. So confusing!
Good job soldiering through the frustration and getting it done. I swear MR2s should of looked like this from factory