really, pick whichever one you like better, can get a better deal on, gets more votes here, comes to you in a dream, or any other arbitrary selector brings youto. for deer, at the ranges you're talking about, you'll find no real world difference between the 7 and the 30-06. Also, if you ever do decide to hunt mule deer or elk, either will work well. If you have a favorite bullet type, check the different cartridges that use it for each caliber to see the availability, sizes,and price
I would recommend a bolt action. It makes a shooter, especially one who hasn't been hunting deer for long, concentrate on taking a better shot. A semi-auto can urge a shooter to take four bad shots really quickly, with the hopes that one hits. A bolt will inspirethe attitude of never taking a shot that you aren't positive will hit where you want it, because a wasted shot can't be followed up as quickly. Also, boltsare still likely to have slightly better overall accuracy than semi's, but not nearly as much as in the past.
I'd personally vote for the 7 mm, but only because I like the flatter trajectory and I do andwill take longer shots than you mentioned. But really, for what you need, you can't go wrong with either.