What's current in CR2 keychain flashlights?

My MiNi seems to have escaped from my keychain, so I'm in search of a replacement. There are few choices out there smaller than CR123. iTP doesn't seem to make a CR2 version of the A1 EOS. The Fenix E15 is of similar size, slightly cheaper, and also CR123. I saw an XM-L keychain flashlights Manafont, the TrustFire MINI-01 XM-L, but also only in CR123 size. It does not appear to have been reviewed here yet.

Some web searching yielded reviews to a Nitecore EZ CR2 from 2009 at laymanslights, but I can't find it for sale. It only uses an XR-E anyway; the MiNi CR2 uses an XP-G. I could buy it again, but considering the efficiency of XM-L's even at low current, I'm wondering if (and hoping) someone makes them in a 'budget' format. Whatever I choose, I'd like it to be under $40. I LOVED my MiNi CR2, but considering I just lost a $39 flashlight from my keychain, I'd like to spend less even if I don't get a really modern LED (Cree XR-E would do at the right price). I just would prefer CR2 for size, as with the right battery and my low runtimes, CR123 has only disadvantages.

Someone probably in a Wal-Mart parking lot somewhere, is gonna get real lucky. They'll probably run it dry and have no idea what kind of battery to get.

BTW I see that Fenix makes a reflectorless (full flood) AAA to cut down on length, E05 $20

http://www.tacticalleds.com/Fenix-E05-R2-LED-Flashlight-p/e05-r2.htm

I wish someone would do that with a CR2/CR123 type of light, or an extremely short/token reflector, to make it even shorter.

UPDATE: Does 4Sevens even still make the MiNi in CR2? It is not orderable through 4sevens.com, and their "new" website foursevens.com, mentions CR2 as available, but when you add a MiNi to the shopping cart, you don't even get to specify which variety. I'd expect CR2 lights to become more, not less popular as LED's get more efficient. There needs to be a choice between coin cell and CR123; that's quite a difference. Half-height AAA size li-ion batteries are available now, and that could be a potential for manufacturers, but I only know of one LED light which uses that, and it's definitely not Budget.