My 1983 R65 recently developed the exact same issue... the high beam worked only when holding the "flash to pass" to the full down position.
On occasion, the lights returned to normal operation. Hmmm... I, too, suspected the switch especially having had the 81's switch disintegrate last year and having replaced it.
The last time I wanted to ride the '83 to work, leaving at 0545 hours, the flippin' light had failed again. In frustration, I pulled of my glow and gave the headlight ring a mighty slap and...
...The light returned to normal ops!
That afternoon, I pulled the ring and lenses assembly, cleaned all connections, ensured the spring tension in the bulb socket was adequate, checked grounds, used some dielectric grease on everything and have not had any further problems.
Don't buy a new ($$$) switch until you spend some quality time inside the headlight shell.
Monte