I decided to go a different route with the key switches. I don't like the idea of gluing them into place, even though that's how they were originally fixed, and I didn't want them to be sitting too high off the front panel as they would do if they were snapped into their locations. Instead, I built this little carrier that is held in place with screws.
Some may not like the non-standard screw heads showing like that, but I figured I'm going with LEDs and colored keycaps anyway, so why not.