Assuming you are running a pair of CR123s, and plan to continue doing so, My recommendations are as follows, in no particular order:
1. MalkOff M60 or M60F.
2. LumensFactory D26 3.6-13V Selected Tint.
3. DereeLight 1SM-2 5A Q3 or R2...
Pick the M60 if you want a lot of light in the center of the output, with far less "wide spill" effect. Great for longer range use.
Pick the M60F if you want a wall of light out in front of you, great close quarters work.
Pick the LumensFactory Selected Tint if you want a nice balance of usefulness. The beam pattern on these is pretty tight for such a small reflector, but the spill beam is strong as is the case with most reflector loaded LEDs. The Selected tint gets you away from the dreaded "blue" light, which you are probably all to familiar with on your P60L.
Pick the DereeLight 5A Q3 for outdoor use, the warmer color temp will work well there.
Pick the DereeLight R2 for more indoor work, or if you think a "yellow" looking LED might bother you.
If you go with the DereeLight, go ahead and just get both the Smooth and Orange Peel reflector, it's only a couple extra bucks and you can experiment and see what you like. the OP will be fine for almost everything but a smooth reflector can be better outdoors for reaching out.
Eric