Forward clicky switch that fits a Convoy S2 or S2+?

I’m looking for a forward clicky switch that fits in either a Convoy S2 or a S2+ without modification.

Has anyone found a good source? The ones in the Convoy store seem too big or too long.

I’ve installed a few in S2+. I can’t remember exactly how I fit it in. Wasn’t a big deal.
Here, I took one apart. This is it pretty standard square fwd clicky. I can’t remember if there was a metal washer in the bottom of the S2 on top of the boot. If there is, leave it out. You have to cut off the nubbin in the center of the rubber boot flush.
Then it’s a matter of playing around with a spacer. Really just a support for the switch. I don’t know where I found that plastic ring. Dig around your work bench for anything that might fit and try it. Washers or plastic bits that came off something you’ve forgotten about.

Hmm, I’ll try that approach. Didn’t think to get rid of the washer. What tool did you use to cut off the rubber nub on the switch? I’m thinking of using a normal pair of scissors but I was wondering if there was a better option.

The plastic ring looks like a spacer from a Convoy S2 switch.

Just press the bottom of the boot until it’s almost inside out, and snip off the nubbin. I used a small flush cutters, but scissors will do just fine. It’s only a nub of rubber.
That plastic ring may have come with a solar force switch I used to have, but use anything that fits. You just need something to support the switch on top of the boot. Try washers.
I’ve done three or four of these in various lights lately and it’s just a matter of dropping things inside until it feels right. The nubbin has to go though.