RE: is it enough?
A caution on the 300WSM regarding the recoil. Some of the manufacturers are really getting the weight down on their WSM rifles, which can noticeably add to the felt recoil. I do think the 300WSM is something to consider.
I don't know that I'd agree that the 300WSM has put the 30-06 "in the back seat" though. While I don't own the 300WSM I think it's a viable alternative. The 300 win mag has been around longer, has nice balistics, and has more ammo variety and availability. If that hasn't stopped the 30-06 I don't think the WSM will.
Have you thought about taking a bigger step up, perhaps to the 338?