Wellp, I don’t have a Sofirn (yet?), so I can’t say anything good or bad about it, but I do like the Zanflare. I like the “spline” knurling, which is quite unique, in that I’ve never seen it on any other light. And my impresison is that it’s a nice solid well-built light. Even the switch-feel is a nice solid low-travel click.
But to further confuse the issue, does it have to be an 18650? If you’d be willing to go to a fatter 26650 light like the DV-S9, it also ticks most of the boxes. It’s a diving light, and has a magnetic slider on the side, so you have infinite “modes”. 
I did a “review” of the critter here. Ultrafire DV-S9 diving light?
It’s got a bigger reflector, so it throws better than a standard tubelight. No silly blinky modes to get on your my nerves, just pure light output from moonlight (barely nudging the slider) to full-tilt (peg it). It’s CW, but I really don’t mind it (CW is supposed to “carry” better underwater), as I just love the slider and lack of blinkies.
Oh, and I mean actual moonlight, not just low or low-low. You might have to tap the slider with your finger to get it lower and lower without switching off, but it gets easier once you get a feel for the light. And I’ve lit up a room via ceiling-bounce just fine with it, no complaints about its output at all.
Nothing fancy like battery-in-light recharging, but it’s something like ~15bux or so depending where you get it.