You should be able to replace it with an XP-G2 or XP-E2 and see that throw has improved. However, if you keep the stock driver, it probably is trying to deliver around 2.8A to the LED. Therefore, with the XP-G2 or XP-E2, either should be mounted on a copper MCPCB before you replaced the XM-L2.
I haven’t got one myself, but the Convoy L4 looks pretty good from that review.