[cctalk] Advice on Repairing a HP1630G Logic Analyser

I have a nice HP1630G logic analyser. It still works OK but has a number of issues that I would like to fix. First, I managed to break the power switch. It became stiff and wouldn't readily toggle the power. I think the shaft became bent. In pressing too hard, I broke off the button on the end of the shaft. Looking at it, I think the button may have been glued onto the end of the shaft, possibly in a previous repair. There are some sites that list the button as available so I am trying to source an original, but I think it could be just the button and not the shaft that goes with it. However, if that proves impractical or too expensive, I am wondering if it is possible to source a new switch, with a long shaft to reach the switch on the board, that would at least allow me to toggle power from the front panel? I am not sure what to search for though, any suggestions? I have several possible workarounds: 1) just leave the switch on permanently and "toggle" the power just by plugging into the mains 2) try to glue the button back on, possibly with a metal pin for strength, but I think there is a bend in the shaft that caused the action not to work well and so this may not work well 3) Raid a spare from a HP1630D that I also have. 4) try to make a new shaft and switch, possibly 3D printed, or just use a piece of wooden dowelling. Any comments on these approaches? The other problem I have is that I get terrible switch bounce from the front panel keyboard. I have removed the keyboard to see if I can get at the switches and see if cleaning them would help. However, the keys (made by Cherry) look like sealed units to me. Again, does anyone have any advice on how to improve the performance of these switches? I could again raid my HP1630D for a spare (which has a keyboard that isn't as bad), but would rather not have to do so. Finally, I get a bit of screen wobble on the display. I am going to check all the capacitors on the display board, but any other suggestions? Pictures of the broken switch and the keyboard are here: https://1drv.ms/u/s!AgETuZFainX8gZNMqek10fyE3n1rlw?e=xd7RWU Regards Rob