Honestly, I'd take a good hard look at Criterion barrels for the price. I'd go that route if I had to do it over again.
Remember that the barrel cylinder (widest point near the recoil lug) on a Savage is 1.05" vs 1.20" or something for a Remington. This means many heavier barreled Savage barrels pretty much look like straight cylinders. For example, my #7 Pac-Nor contour hardly tapers at all because it starts significantly thinner to begin with. You won't be able to really match an M40 contour while using the barrel nut. Picture of the #7 with a barrel nut: