Two thoughts come to mind...
1. You have way more magnification than you really need for tactical shooting.
2. You have just about the right amount for F Class shooting, although most of the top end shooters are moving towards higher magnification and bigger lenses in that sport.
I've never heard anyone say that Nighforce wasn't "tactical enough" as their optics are pretty beefy.
Generally you want 0.5-1x magnification for every 100 meters you plan on shooting, 2-4x magnification for every 100 meters you plan on observing. Rough guidelines, but it is generally where I start for planning.
Another Leupold would do you fine, as would the Nightforce or Vortex. But if you wouldn't mind looking at just getting a new scope for the 300 Win Mag, then I would consider this:
Bushnell Elite Tactical XRS 4.5-30x 50mm
Buddy of mine who shoots F-Class couldn't believe how user friendly the FFP reticle was, and the glass on the model he used was extremely good.
If you want serious magnification, look to the Leupold VX-6 lineup. Don't worry about it not being "tactical" enough as even the single spring setup in the VX line is stout enough to repeatedly handle a 338 Lapua. The double spring setup for redundancy is the real difference (along with a slightly thicker scope body) between the Mk and VX scope series.
VX-6 7-42X56mm (34mm) Side Focus Target
But it will cost a pretty penny.
Hope this helps.
Jimro