Modern electronics = Full rewire

Relays. I would not fiddle with all the wiper relays. So far as headlights, make sure you make that circuit RELIABLE. You don't want to lose lights at 70+ at night.

I WOULD ADD a relay fired by the key "run" circuit, as voltage drop in that circuit is a big problem, and affects the voltage regulator, causing it to overcharge.