In a semi-auto I'd go with a .308 any day over a 30-06.
For deer in general, even in a bolt gun, I'd prob take the .308.... I'm a fan of short actions. The .06 is a true multi-purpose gun, and you can't take anything away from it, unless you are trying to fit a specific niche.... which you kinda are.