Best way to rewire through firewall... stock connector? aftermarket bulkhead? other?

[CentralCoaster]

I'm doing a little rewiring on my truck, the previous owner left it nothing short of a fire hazard.

This was a bare bones 6-cyl USAF truck. I'm not sure how many ports the stock bulkhead connector is, but I need to add a few extra circuits, TCC controls, guage sending units, fan controls, elec choke, hei, etc.

I bought a weatherpack connector kit, but that doesn't help me with the firewall. And they only accomodate up to 6 pins.

My first thought is assemble the underdash harness(es) and run them through the firewall with a grommet, and put a weatherpack on the engine side of the firewall, and connect the new engine harness to there, although it would make it impossible to seperate the interior harness from the firewall. I'd probably need two of those in addition to the stock bulkhead connector

Or do you guys recommend gong from scratch with a new single firewall connector for everything? I couldn't find one of these at summit, unless the whole wiring kits have them. Where to get one?

Or should I just buy a Painless (or other) setup now, since I need a new fusebox too? I really don't need to rewire the whole truck though, just the under dash and engine.

All these spade connectors and gangly wires and zip ties it has now are an eye sore.