I think the p7 is sitting too deep in the reflector. I came to this conclusion by adjusting my mag flashlight to create a donut hole. I can adjust either way on the mag and create a donut hole past the perfect focus.
Have you tried unscrewing the head of the light with it turned on to see if it helps? Try that.
Have you tried unscrewing the head of the light with it turned on to see if it helps? Try that.