If you don't have to have OEM, I've had real good luck with Molex brand connectors from Mouser Electronics. Nice quality stuff. They even have high amp connectors for things like electric fan setups.