[particlewave]

If you've already replaced the headlight switch, that can be eliminated.
I'd start with the connector on the headlight tray (make sure it's getting fully seated), then replace/repair the high beam stalk.