Right hand controls 90 GL1500SE

I'm having issues with the starter button. i have used contact cleaner and that fixed problem for a while but issue of not starting when button is pressed has returned. i have not taken apart controls and cleaned or inspected to try see whats going on. I' thinking about replacing with new right hand controls but cant find new controls in stock, discontinued. Any suggestions would be greatly appreciated. I very much enjoy reading the post learing about goldwings. Thank yall for sharing all the knowledge with us that dont know alot about Gold Wings.