I also would not switch barrels. I'd use the 300H&H with 200 grain bullets and you'll find it ruins less meat than a 25-06 with a 100 grain.
Buuuuuuuuuuuut.......................I, like you, would maybe buy a whole new rifle, as it's never a bad thing to get a new rifle.
If I were to buy a dedicated Deer Rifle with a 30-06 length action I'd look at the 25-06 and the 270. I love the 270, and it's all I could ever ask for as a deer and antelope rifle, but to be honest, it's more power than truly needed. Not that it will ever stop me from killing more deer with it.
I have always liked the 257 Roberts and the 6.5 Swede too.
Or if you want a short bolt action, an auto or a lever action but want something fast, look at the 7-08 and the 260 Remington. If you don't care how fast it is, there is still nothing wrong with a 30-30.
