Looking for switches for M2 controller

[pontiacg5]

I've got an old M2 mill and a lot of the buttons are really worn, they usually only work intermittently.

This controller uses standard "plunger for cap" style pushbuttons. The switch itself is soldered to the board and a black "foot" snaps onto the top of the switch, then there is the standard overlay that sits on top of those black "feet."
I've tried cleaning the switches with normal electronic contact cleaner and they seem to work OK for a short period after that but then they eventually go back to the way that they were.

I want to replace the switches, but I'm not sure where to look to get them. They need to be as close as possible dimensionally, especially for that foot to snap back on. Has anyone else had to replace the buttons before? If so where did you find some replacements? I could scroll through digi-key for a week and I probably wouldn't find anything this specific!

Here is a picture of the buttons with the little black feet.
http://i879.photobucket.com/albums/a...g?t=1291304893

Thanks for any pointers!

[pontiacg5]

Just in case anyone was wondering I found a suitable replacement switch.

Digi-Key Part Search

The original foot will not fit on this switch, you will need to turn up a replacement "plunger" to make this switch work. The plunger needs to be about 230 thou tall with a ball on the end with a 42.5 thou radius. I just turned a few up from 1/2 Delrin.