RE: A good overall rifle
I'd personally stay away from a 30-06 and get the 7mag between those two.
Out of the short mags you may want to stay away from the 7mm WSM, it does not have the following that the 300 and 270 has. The 325 is the newest one out, and its hard to say if it is going to catch on or not.