I see that this OEM switch is still available at least from Partzilla and possibly others.
https://www.partzilla.com/product/honda/35340-KFG-000?gad_source=1&gclid=CjwKCAjwjsi4BhB5EiwAFAL0YFnLzanTXe0uqkYUOwXJLvN5m86EqqUxvxPXOdEsTQ4XDBwBEwQtZRoCzHoQAvD_BwE
Should these at some point become no longer available, I have found another source..
I recently bought an aftermarket piece on Ebay.
https://www.ebay.com/itm/315018988247
I found it via Search. I recognized the seller, as I bought a rear brake light switch for my 1500 Goldwing from them this summer. My experience with both pieces has been excellent. Great price, fast shipping, direct replacement, worked first time every time (so far).
Hopefully this might help someone down the road. The riding season has just begun here!
Ron in AZ