Need advice for my First flashlight build

Gday everyone.
I’ve always loved flashlights or as we call them in Australia torches. But never built one before. So I’m after a bit of advice on my first built.
I’ve got a cheap Chinese hunting flightlight that has stopped working. So thought I’ll upgrade it a bit.
I’m looking to get the most amount of throw I can get out of it.
I was thinking a xhp35 hi and then a driver to suit
I can’t work out how to load pictures of the flashlight from my phone
So basically flashlight used 2X 18650 batteries, 22mm driver and a single led that I think was an xml2 (but can’t guarantee that they really used a genuine xml2) in a deep reflecter and had a fairly tight spot.
So just after some advice on what led and driver etc I should use.
Cheers Alan

Since it is using a 2S setup, you are in luck.

Get this driver:

http://kaidomain.com/p/S026504.H2-C-22mm-1_5A-1-or-2-cell-5-Mode-Boost-Driver-Circuit-Board-for-Cree-XHP35-XHP50-12V

Get this LED if it uses a 16mm MCPCB:
http://kaidomain.com/p/S026111.Cree-XHP35-HI-Neutral-White-4000K-LED-Emitter-with-KDLIGHT-XP-16-16mm-x-1_5mm-DTP-Copper-MCPCB

If it uses a 20mm MCPCB:
http://kaidomain.com/p/S026110.Cree-XHP35-HI-Neutral-White-4000K-LED-Emitter-with-KDLIGHT-3535-20-20mm-x-1_5mm-DTP-Copper-MCPCB

Good luck!

Thanks mate
They look pretty straight forward to put it together.

Hey mate you will also need a centering ring for the XHP35. Any reason you want to use the 35 and not the XHP50 you could get decent throw from the XHP50 and it would be brighter.

Also does the original LED sit on a shelf?

I’ve got the original centering ring from the old led that I popped out hopefully that will work.
Yes the old led sets on a shelf
The only reason I was thinking the 35 was I was reading that the 35 throws a tighter beam. Not sure how it makes a difference, I would have thought it would be mostly the reflector but I’m still learning