Agreeing with everything else so far, you can also do some fun things with the XP-C Q4s. Get a 1.2 mm wide strip of copper (less than 1mm thick). Solder the XP-C onto it. Solder wires onto the bottom of the two pads. Glue it down to a cheap $2 DX dropin pill. Flood some epoxy into the pill to hold the wires in place. Drive it around 1A with a 3 x AMC7135 board.
Total cost of all parts is under $10 (though it'll cost a bit more by the time you pay for shipping and spare parts). It'll take a few hours if you've never done one before but after that you'll do the second one much quicker.
The XM-L is probably giving you around 10,000-16,000 cp, a 1A XR-E R2 gives about 20,000 cp. The XP-C as I've described will get around 32,000 cp.