You are absolutely right - they've been out of stock for quite a while (5 and 8 mode version). I just bought 2 mode version, which is perfect for cycling as you only want high or low, depending on your ambient light condition. I'm getting 2 more to replace the fenix on my helmet and a spare.

Is the two mode version voltage regulated? I was going to get the 8 mode because it supposedly is.