That one I pictured was actually for my forward light harness that went under the fender... used 16ga wires where as the EFI controller uses mostly 20-22ga so I went with a larger capacity pin.
I went with MS3470L18-32 for the bulkhead and the MS3476L18-32 for the connectors... I am running a MS3X so I have about 46 wires so I ran two connectors which leaves me room to expand if I decide to run other things in the future like flex-fuel or boost...
The connectors run a MSRP of about $80.00 for each end (but can be found cheaper if you shop around) but the crimper for the pins is also needed and about $300 for an economy model so it's a pretty sizeable investment over just a hold with a rubber grommet.
If youre looking to replace the factory bulkhead you may want to go with something like an MS3470L24-31... it has 31 pins for 16 ga wires -- your factory bulkhead has about 24 pins to this gives you some extra and would allow you to keep the factory wiring sizes -
