Have you tried this mod? L21a has a relatively big reflector, much bigger than L16/EC60. I may be wrong, but L21a modded with XHP35 will have a way more intense and focused beam than L16/EC60.