There are other options if you like, Direct Thermal Path PCB, FET driver, etc, but you can reach the point of diminishing usefulness. I recommended those as you should be able to order, get free shipping, and have a noticable improvement in output. Although, some if those old XR-E lights like yours can still be decent throwers with the small emitter and narrow beam angle.
XP-E2 Torch at about 2 amps would also make a good option if you want a tighter beam with less spill.
