Number 2 looks like it might work. Below is a picture of the back of the supply. The PSU looks to have 20 signal. I doubt they would line up appropriately or the spacing might be too wide. Awesome site though. I did find this through browsing and looks like it might be a match. Need to look at P7 though on the datasheet. Looks weird. Unfortunately, no stock a min order qty is 264 @ $6.18/ea. Not a bad price if it is the correct connector and there are enough orders. Might be able to request a sample or a smaller amount?
Let's continue searching... (looks like J4bberwok had already replied)
