Its going to be tough to have someone on here give you exactly what will be best, but take their suggestions into consideration.
I myself am a former Army guy who grew up with Surefire. But now as a police officer I have broadened my horizons.
You'll have to take many things into account. Generally for your price range and stated 3-4 needs, most people will suggest the solid choices that are all within that range, so you're off to the right start simply by doing research here.
But what will set those lights apart that are in the same category that make it best for you, is for you to decide. The best thrower, nor the brightest rated light will not be the best light always.
Here's my two cents though. I was issued a stinger, so thats my primary and its convienent to charge and has an ok heft as an impact weapon (there are better ones, but it does work). Hopefully as a LEO you will always have more than one on you. Personally for me, I always find myself instinctively grabbing my pocket light first anyway. So battery life is key for my secondary as well. Whats your tendancy? Also, I want my pocket light to be as bright as possible, or at least more of a thrower than my stinger.
Here's where your circumstances come into play. I have a deep billy pocket in my uniform. Because I want to have a solid lasting and bright light (again, the comprimise a bit, you can't have the brightest longest lasting light in a pocket light), I'm opting now for the Olight t25 tactical. Its a little bit long compared to your current P6, but again, it works for me because my uniform pocket is deep enough to handle it. It uses 2 aa's, which I will get eneloops, because its going to be cheaper for me to recharge and those batteries are solid IMO. The UI and strobe is not something I have on my stinger, and again, i instinctively grab my pocket light, so for stressful situations, I want this for my pocket light along with being the brightest thrower of my arsenal. It has good features for my tendancies. Do you find yourself twisting your tail cap or locking the button? There are even reverse tail caps and considering if you like to have a clip or a nonrounded light on the edge of the light.(believe me, small point, but when you set it down, you DON'T want it rolling off the hood).
This could be seen as nit-picking, but I value each of these considerations as LEO. The options are out there, so why not get the one that fits you. Also, try not to get two completely different lights from your primary. Create those good habits. I'm going with the Olight because my first primary was my trusty E2e, but its not anything like the stinger with both the twisting tail cap and button. It does off in my pocket when my duty belt hits it akwardly, or having to twist it off will make for a bad day when I need it instantly. Consider that for sure!
If you're on here, you're probably serious about making the right purchase. Some enthusiasts simply enjoy buying for their reasons. You buy it because it could save your life. Take their expertise into consideration, but at the end of the day......you have to make it work for you. Take your time and definately get your hands on a few before buying.