I can confirm the L2i fits an 18650 also. I ordered one after Christmas, and it arrived on the 10th. So far I've been impressed with it. Only complaint would be that the rear o ring was dry and pinched. If you get one I don't think you'll be disappointed.
I have the L2i and L2 and I like the L2 more, esp. if you're going to use 18650's anyway (the XM-L should run a lot better with 18650). I was surprised how well the 3xAAA's work with a P60 host though when driving an XP-G. So I like both. I don't understand why the L2i costs less. I can fit an 18650 in there if I get the battery lined up correctly, but it is still tighter than I am comfortable with and I have a hard time getting the battery lined up unless I load it from the head end. The 3xAAA carrier is 58mm long compared to 65-68mm for an 18650. It just feels like you're making it work with an 18650, not that it is really designed to work with 18650's.
Mine is the exact same as brted's. I love it, however the fit of the 18650 does bother me a bit. Once I get my flat stainless bezel ring instead of the sharp crenelated, I'll be much happier. Its a beautiful an well made light, and as Don said, I really like the feel of the thicker body.