I hear you. I put together an M30 with a two-stage McE2s switch. The problem is the McE2s are pretty hard to find now and my switch always feels kind of "iffy." It works, but it feels weak and unstable (i've tried it both in a SureFire Z68 and in an Aleph tailcap).
Another vaporware optinon :nana: is the rumored ElZetta single-cell body. That would provide a bomb-proof host for the M30 combined with their two-stage tailcap. I have this tailcap, too, and it feels rock-solid, compared to the Mc2Es. I read on another forum that ElZetta is seriously considering offering a single-cell model. Based on their past record, they bring final products to market very quickly. The current ElZetta designs don't have clips, however.
The ElZetta tailcaps are surefire C/P compatible, i.e., you could use one on a SF 3P or clone.