Something I did to solve a similar problem on an old beetle.

I used a foglamp relay to switch the direct power to the starter solenoid in close proximity to it.  Then I just used the starter switch to power on the foglamp relay.

Worked with no more problems.

Steve