I would suggest not splicing the wires coming from the bulkhead connector. You can buy the connectors from this place and run new wires staright thru with no splicing. Its not that hard to do and really cleans up the wiring harness. If you spring for the right crimper they come out like factory.
http://www.texasindustrialelectric.com/_packard_terminals.asp
http://www.texasindustrialelectric.com/_packard_terminals.asp