Adding relays is a great idea, it takes a lot of load off the switch.

Modern switches are not anywhere near the quality the original switches were. I put 4 different aftermarket switches on my son's car before we got one that actually worked. Each switch had a different issue. All 4 switches were from local auto parts stores (each store only had one on the shelf), but once out of the box, all 4 looked identical.

Be forewarned, just because you have installed a new headlight switch, that no longer means you have installed a good switch. Gene