I highly recommend a Stainless Steel Benchmark Barrel, a #2 contour is probably what your looking for or a #3 contour but no heavier than a 3, barrel will cost $600 shipped to your door from Gary&Ebony Eakin of Bighorn sales, add $125 for fluting,
labour costs will be about $500, give or take a little, I would recommend having your action/bolt face trued and squared while you have it apart.
I just built a 6mm Creedmoor on a Winchester 70 action and a #1 contour 24" SS Benchmark barrel,
Being from BC I've had rifles built by Mitch Kendal(Kamloops,BC) and Gary Flach (Langley,BC), both gunsmiths are excellent, only difference in the two is Garys turn around time may be a little quicker.