I'd say that if you have your heart set on a Savage, go with option #1. That's at least $3000 worth of hardware, probably more, depending on the stock. Sell the .308 barrel on here and recoup about $300-350. Play with the .30BR, if it's not to your liking, sell it for another $300, and replace it with a Criterion in 6BR.
However, if you are truly after one hole groups from the bench and nothing else will satisfy you, I'd say your $2500 would be better spent on a good used custom-actioned competition benchrest rifle. Check the classifieds at Benchrest Central. Don't get me wrong, I love Savages as much as anybody here, but most of those rifles are truly at a higher level of refinement and accuracy.