I've been using Sorfin SP40 - single 18560 cell Zebralite clone, for while now.
Fits nicely with my Phaethon and means I have interchangeable batteries.... I always carry 2 spare batteries. Plus the one in the Sorfin now.
It's stood up to everything including several lake swims