Replacement switched worked great, and the unit is back up and running with the hot switched.
For future reference, incase someone else has this happen, the Cherry equivalent is the CH755-ND. Fits the cutout perfectly, and feels SO much better than the stock switch.