You could change the emitter in your C8 to a XP-G2 on a copper board and dedome that one using the gasoline method before soldering it into the light. Mind to center the led well and make the solderblobs on the ledboard as far as possible to the side and very flat, to clear the reflector. At 3 to 3.5A it beats the XM-L2 in throw by at least a factor 2 (at the cost of a smaller hotspot and dimmer spill)