Bee,
Without wishing to add to your workload and time you've invested in Goldwing right switch gear rewiring, ever considered these Yamaha left switch gears? Seem to have everything for an FI Bird (bar a choke lever as I'm a carb Bird).
One even has a hazard light switch (I'm mod'd to add hazards though via a Suzuki switch gear).
Interesting KTM right switchgear too (though same problem: missing light switch as GL grear).
The Pan Euro (ST1300) seems to have a Police set for right side some have used for cruise control without losing the headlight/ drl switch (albeit a touch ugly and prob needs bar risers)
35150-MCS-A31
It looks to be the same as an older GL set plus another upside is it has two extra switches which can be used for aux kit (e.g. TPMS on/off in my case).
I may still be minded to go for this GL set (35013-MCA-505) and mod the extra "RSV on off" switch to headlights/ parking DLR/ Off instead.