New torch? Or replacement battery (ITUO Wix-XP2)

thomasmorris
thomasmorris Posts: 373
edited November 2019 in Road buying advice
I got the Wiz-XP2 three years ago and I've been very happy with it. Programmable settings, remote switch (wired), nice throw but with good optic so no 'rings' toward the spot. Unfortunately the batteries I had have given up the ghost (after poor summer storage).

I had a 4 cell bank with 18650... so I could just replace the cells in that. But the plactic case is annoying against my metal frame.

Or I could by a 4 cell battery pack to replace the original pack (4x18650 8.4v 6400mAh)... but can't find them for sale separately.

Or, given it's not three years on, do I replace with a new torch. I bought the ITUO several years ago when I was doing long night rides and wanted to be able to swap out packs. But nowadays I'm only commuting or doing 2 hours max in the evening (still dark back lanes. So is there an all in one unit I could get that would perform as well as my ITUO Wiz-XP2 did? Preferably with remote, maybe with better optics to not blind oncoming traffic?

TLDR...
1) anyone know were I can get replacement battery?
2) Is there a better standalone torch unit i should replace with?