[...trimmed text...]

I'm not sure if you do this as well from what you wrote, but for others' benefit:

The OEM part is dirt cheap as connector housings go, but I get them a bit cheaper by buying 4 or 6 at a time on eba... Login to read more.