Compact single 18650 flashlight to replace SureFire E1e LED

I’ve been using a SureFire E1e LED flashlight for years. I carry it with me every day, clipped to my belt. Well, I did until I lost it in Death Valley yesterday. I really liked the compact size and tailcap button on the E1e. I didn’t like having to deal with CR123 batteries however.

So, I’m looking for a replacement light. I’d prefer it to use a single 18650 since all my other lights use those batteries and I have dozens. It needs to have a study clip and a tailcap switch would be preferred.

Any suggestions?

Thanks!

How about a Solarforce L2P, a Solarforce clip, and a XM-L U2 P60 drop in. All of these can be bought from Lighthound.

I have a Thrunite TN12 and an EagleTac D25LC2 for EDC purposes. Thrunite is a forward clicky, ET is a twisty. Both are small but great performers. Now I have an eye on Crelant 7G3CS. It looks like a nice light with an efficient U3 bin and clean lines.

Thanks for the suggestions. The SolarForce combo looks good but I think it’ll end up being too long. The D25LC2 clicky is looking like the best bet so far.

Thanks again!