Grounding Fire (almost) - Now What?

I am becoming quite certain the right move here is to re-wire the entire car. Inspecting more wires, heat and age have had their effect over the 50 years that this baby has been making people smile. The idea of a potential fire because I took a shortcut doesn't sound like something I want in the back of my mind. I am going to do some thread research on total rewire projects, and then will likely start a new thread. Thank you all again for your input.