Almost same dilemna as you. Sold off my 10FP target rifle and traded my Ruger Laminate Compact to get one rifle that does hunting and target. I was settled on a Savage 10 Precision Carbine, as I'm a Savage fan, but I ended up trading for a Remington 700 SPS Tactical in .308.
If you want to hunt with the heavy barrel, I definitely recommend a 20" barreled SPS or Savage 10 PC. Either way, bipod would be way useful.
The hogue stock does have flex, but from what I've read, the rifle still shoots awesome. For a replacement, I would get a Bell and Carlson (#2094) or possiblly a McMillan A5?
http://www.bellandcarlson.com/
For the price, I think a Bushnell Elite 6500 Tactical 4.5-30x is the best value going. Although I currently own a 3200 Elite Tactical 5-15x and at 15x, can still see holes in targets out to 300 yards.
You said budget...what were you thinking?