I have had a 30-06 of some flavor or two for almost 30 years. I havent killed anything with a 30-06 since 2006.
I killed an elk with my 7 WSM last year.
Been using Hornady 7 WSM brass for a couple years, no complaints, Grafs has it in stock right now.
I would take either chambering if forced to chose.