I did this years ago on my 16V VW Scirocco, German cars all suffer from lousy headlight electrics. They also run the power directly through the switch, this shortens switch life. I used relays from a Buick (this was years ago, forget exactly what year Buick) they came in a nice mount from the factory. I forget the gauge wire I used. Worked great after I got a good ground.