Replacement switch for Xiaozhi / Convoy S6

Looks like the switch for my Xiaozhi is toast, where can I get a replacement?

The board measures about 15mm in diameter and seems a bit small for the space its in.
Also, mine had the copper threaded nut on the bottom, the switch board, an aluminum washer then the boot.
The 15mm switch board seems to be loose fit between it and the copper nut, perhaps mine should have had another washer?

Mine is the 2.8a version so the switch would need to be pretty good.

I replaced the switch of my copy with a Solarforce switch I had lying around in my spare parts box.
It is a bit bigger in diameter (17mm?) and got a longer spring, but worked fine, to be honest I got the feeling that it fits better than the switch it came with.

Unfortunately the driver of my Xiaozhi is toast or a connection is bad.

Don’t remember exactly what all I had to do to replace the switch but I do remember that I
replaced it with this one. I purchased them about two years ago.
http://dx.com/p/16mm-101f-gold-plated-clicky-switch-for-flashlights-10-pack-15879

Here: http://www.cnqualitygoods.com/goods.php?id=1507

edit: And the bare switch, if you want to reuse your original PCB/spring: http://www.cnqualitygoods.com/goods.php?id=1854