RE: 30-06 vs 308
There isn't enough of a difference (IMO) to weigh that much on one being better than the other. Short action versus long, little bit more velocity/powder and the upside of being able to throw 220 grain offerings from the -06 whereas a .308 pushes 180's on the far side. Whatever you shoot better would be my suggestion. I'm an -06 guy but .308's are really just as good for what you're looking to accomplish. If you're going to be steering towards predominantly deer sized game and smaller, the .308 is your way to go, as most major ammo companies produce varmint loads up to the .308 range and usually no further.
Either way, good problem to have I guess.
(Don't look past the 7mm-08, either).