Now that I have an electrical schematic that is closer to reality I decided to make some of the ground wires forward of the firewall.
I have fast-on terminals on the grounding block, so I stripped some 18ga black wires, and crimped on the fast-on connectors.
Then I printed labels for each end of the wires, with 8pt type, and put them under clear shrink-wrap tubing (photo 2).
In photo 3 you can see 4 grounds connected to the ground block.
The wires on the smoke oil pump/solenoid, were too short, so I spliced, soldered and heat shrunk on new wires. Now I have plenty of length to get to the instrument panel.