Yes, thanks Sean, I did change them out and plan on the sticks as well. Note that the CP I'm using and modified is the orignal nasty one that I spent hours on removing the G2 sticker and residue to reveal a mint G1 underneath.
Also looking for Coin Controls Blue, Yellow and Green coin reject buttons to anyone that has them...