Dash harness replacement and upgrade.

Ok... BIG THANKS to TXDart...I now have a Painless Wiring Cirkit Boss 7 circuit fuse block kit pn 70107.
3 constant hot and 4 key on.

I am off for the weekend and need to formulate my plan to get started tomorrow.

Currently I have too much stuff running off my starter relay and spliced into my dash harness.

Electric vacuum pump.
Electric fans on relays.
Dakota Digital fan controller mounted on lower firewall above headlight foot switch..
Tach and guage lights.
Headlight relays.
Electric choke.

If any of you have done this or can help me decide the best way to route this I would love to hear it. Pics of your installation would be welcome also.

I have heard the female terminals of the dash harness could be cleaned with a vinegar and water solution followed by a baking soda and water solution. Is it worth trying vs swapping all those connectors?
They are so small, will normal ratchet type crimpers work well on them?

Thanks for any advice.