Electrical Upgrade - Items to consider

Yup, that is exactly what I am trying to do.

What would you recommend?

Stupid as it sounds? I like the way the factory did it. I mean my GAWD it lasts 50 plus years. If it looks suspicious, just break it apart, clean it up re-solder it and shrink sleeve the hell out of it.