I'd buy a Criterion from Northland Shooter Supply, again.
If you buy a Shilen it's gonna be cheaper to get it through a broker than it will be to buy direct. Jerry The Barrel Man or Northland have both handled mine.
You've already heard, Buy the wrench and headspace gauge. Watch some youtube videos on a Savage barrel swap and we can help steer you bit too.