How are you guys running your HEI wiring?

[CastIron]

I'm replacing my original 307 with a new 350 on my '69 C1500 and making some other mods at the same time. I'm installing a new HEI distributor. My plan is to remove the original resistor wire from the bulkhead connector and run a new wire from the same position on the connector directly to the distributor. Is anybody else doing it this way?
When tracing the original wiring it appears that the resistor wire runs down the harness to near the starter, then splices into the yellow wire that runs between the starter solenoid and the original coil. I plan on removing this.

On a slightly different subject, I'm adding an electric choke carburetor. I haven't figured where to run it that wire from, but I'm planning on checking to see if there's any empty places on the bulkhead connector that have power when switched on. Anybody have connector face diagrams that show what wire goes where?

What do you guys think? My goal is to have a clean-looking, reliable engine harness.