Good, glad you found the right one.
Yeah, those micro switches.....man, they're pesky bastids. I would definitely replace them all.:D
Also, you can't overlook the mechanical aspect of the switch buttons either. All of them have these spring-loaded levers that are made out of paper-thin metal...