I like 18650 lights too. As of AAAs, I'm getting rid of bunch of them. Still using a Lezyne Super drive that takes 18650 & loving it. Too bad they went with proprietary batteries now. And if I needed a new front light right now, I'd get this: Fenix BC30 LED Bike Light - Fenix-Store