I'm a total novice, I have a Fenix P2D and I don't like the circle of light around the hot spot, at long distance it illuminates more than I want.
Very bright, very ugly, spill is inherent in lights that use forward facing LEDs mounted in reflectors. What you need is a light which has the LED pointing rearwards or uses a refractive optic. There aren't many choices here, period, much less choices that meet your brightness and size requirements.
Your only options are from Surefire,
LED Lenser, or to go with something custom. On the SF side, look at the E2L, L1, E1B, Kroma, or UA2. Most of LED Lenser's new generation models use optics; the most promising unit for your brightness and size requirements is probably the
T7. I don't know what's available on the custom front, but a feeler posted to the custom forums should garner some results. These are pretty much the only lights available that have modern LEDs and use refractive optics. Pelican's recoil line use rear-facing LEDs ('reflex' in Pelican marketing speak) and therefore have good beam profiles, but they use older generation LEDs and might not be bright enough for your needs.
Incidentally, the lumen figures quoted by manufacturers are to be taken with a train load of salt. The figures range from exaggerations to outright lies. The only way to know how another light stacks up against your P2D is to do a head to head comparison, or ask someone who has both lights to do a comparison for you.