I had a Acebeam L16. A XHP35 HI in a Convoy L2/L21A has a much narrower beam. A XHP35 HI in a C8+/M21A has a very similar beam. The problem is the driver…… The C8+ takes a 17mm driver, the M21A takes a 20mm driver. If you have someone that can machine and thread it to 22mm then you can just use the Convoy or Kaidomain boost driver. Or be patient and spend more money on the 17/20mm boost driver from Mountain Electronics.

Or just use the 5000K SST-40 Convoy M21A with a LDx4 7-9 Amp driver from led4power.com. It’s a bit more floody than the L16, but brighter. Also, forward clicky tactical switch similar to the L16. I enjoy it so much that I gave my L16 to my dad and built another M21A. I have one in my car and in my house. I set the driver so that it always turns on in high mode (7A “turbo). The 21700 cell is also a major advantage in such a powerful light.

Edit: For more throw, I also recommend this mod in the L21A with a 20mm driver adapter. It just depends on what you want to do. The M21A is a lot more pocket friendly though.