why not have both? just stuff a diffuser (slip of plastic) over any 18650 light out there.
OR
remove any optics, or reflector, in anything, and replace with white paper, or white plastic, or reflective window film (like 3m house film) put that stuff around the BARREL, so the light not being directed, still goes out the front.
the simple Tri-Star mag thing without any optical alterations (toss the reflectors), makes one bright wide thing really fast. and its just as easy, to put a piece of diffusion over the lense, or just 400 sand the plastic lens.