RE: Second rifle choice?
I am not a fan of the 30-06 but if I owned one I don't think I'd get a 7mm (you didn't mention which one). Its your money but I'd either go bigger (300 Win. mag. 338, 35 Whelen) or smaller 257 Wea or 25-06).
Didn't really answer your question but the 06 and most 7mm's are pretty close.