TK, here's another pushbutton option that is similar to the ones you were using. They are two piece and roughly the same price. The cap has a slightly smaller diameter but they are taller. The footprint looks to be the same and the behind the panel is the same. They are made by the same manufacturer as well.
http://www.digikey.com/product-detail/en/KS-03Q-01/EG4794-ND/2116273
http://www.digikey.com/product-detail/en/ACC-C17-2/EG4804-ND/2116283