I had the same problem and used the same solution.
I spent part of last winter rebuilding the engine bay, forward lighting, rear lighting, and fuel tank harnesses. I admittedly got a little OCD with the entire process, particularly when it came to tracking down the correct Delphi connectors and wire colors. I also very much wanted to avoid any soldering in any of the wires so I looked and looked for just the bulb-contact terminals for the rear, side, and turn signal sockets. No luck.