I've just received the connectors mentioned in the previous post (FCI 10046971-001LF), and they are a perfect fit.
This should allow me to make a nice clean job of connecting up the leads, and also means I can easily swap PSU in the event of problems.