As part of my re-wiring project I've sourced some really nice connectors to tidy the whole thing up. They are made by Deutsch and are OEM on some vehicles. They are dust proof and waterproof and have silicone seals inside them.
I bought a kit of the DTM series. They are rated to 7.5 Amps per pin
Deutsch DTM Series Connectors
I also bought a kit of the DT series with pins rated to 13 Amps.
Deutsch DT Series Connectors
I'm quite impressed with them. They are easy to terminate and you can remove the pins if you need to change the layout or modify anything.
Here's a video on how to terminate them. Pretty straightforward and a really neat finish.
[ame]https://www.youtube.com/watch?v=LIR9-ZdG958[/ame]
Cheers