hehe, had to make some corrections to my comment. home-depot doesn't sell envelope labels lol.
Yea, I would change to some good ol' standardized connectors. Digi-key is a good place to start, but it can be overwhelming. DB-xx style cables for ECUs are a good place to start but they can be VERY tricky to solder depending on the quality you get.
^A bitch. especially with solid core wiring mixed in with the conduit style wires.
You can spend a bit more money and get something easier...pinning maybe a good alternative, but sometimes it can require a special tool.