The switch you are looking at should work with the updated 2.1 - I can't speak to the bounce on it and if it will work with a 2.0.
Check out the dimensions on that switch that you are looking at - 19mm diameter is really big
Also, it doesn't have an LED that will light up
The one I'm using is 16mm and stainless steel and has an LED inside. It's lower profile than any that are available in America, as most of them are too tall to fit in a hilt. I had to special order it from china in bulk through supplier that I arranged a deal with, so unfortunately it's not something that you can easily get... I'm not saying that it's impossible though ;)