I ordered all of my coloured wire and Narva connectors (2/3/4/6-way) from Graeme at Larrikin Products. Great service and way below retail price.
LARRIKIN PRODUCTS - Cable Ties, Electrical Imports, Wholesale, Trade, Retail: direct to the public - larrikin products, sydney -
I used Narva connectors wherever I needed to allow lamps etc to be removed from the main loom, everything else is soldered and heat shrinked. I don't think I used a single spade terminal, plenty of ring terminals for earthing to the chassis etc.