Google "Vintage Connections", I used their connectors and crimp tool when I wired in the Sparx and halogen conversion. $10 minimum for international orders, but that's not hard to do. The first time using the crimp tool was one of those "why didn't I do this years ago" moments. It crimps the bare wire AND the insulation, just like the factory stuff - neat, clean, and secure. Get the plastic insulators, too.
You could also check "Eastern Beaver", they carry some nice stuff, too. But if you look too long at their stuff, you'll start thinking about a total re-do of the electricals, so be careful!