[kitcarbp]

767- Great work on the brake lines, you have more patience then I. What I did to get rid of inferior connectors on my harness was to purchase GM type Weatherpak pigtails from PEP-BOYS. They sell 1, 2,3, and 4 pin male and female connectors separately with about 4 inches of wire. This way you just solder and heat shrink tube each connection and dont have to buy all the tools. Depends how many you need. If you need a bunch, better get a kit it will be most cost effective.
The only caution I would add is I dont remember the pig-tail wire gauge sizes so it may not be sufficient with high-beam headlamp current load, need to check that. The alternative as you stated is to buy the weatherpack kits on line and attach your own connector ends, you will need the correct crimp tool, and pin tool and a little more of that patience you have and you avoid the solder joint of the pigtails. There are a ton of kit suppliers on-line, easy to find. Enjoy.