Way cool!

The shaft size thing is going to (eventually) happen to all molded Mk2a buttons anyway, unless they are molded with space for the spring clip. I'd suggest not worrying about that - once the button works loose a thin layer of hot glue or silicone on the flat part of the button will restore the friction fit nicely.