If you are using a new bolt and new barrel, I wouldn't even bother with checking the headspace.
Q: How do I Headspace an AR-15?
A: Courtesy of LTC Santose
99% of any "concern" about headspacing is based on a lack of knowledge about what headspace is and does. Unless you take a grinder to the bolt, or fire several thousand rounds of ammunition on AUTO, you can't induce dangerous headspace. The Army, which fires a zillion rounds a year has one (1) gauge. Gauge, headspace, field. That's it.
If you buy commercial barrels and bolts from Bushmaster or Colt's you don't need to worry -- or even THINK -- about headspace. Unless you've fired several thousand rounds of ammunition you don't need to worry -- or even THINK -- about headspace other than an ANNUAL check with the field gage. Reserve units only do it every two years. If the bolt closes on the field gage you fit a new bolt. If it closes you fit a new barrel and use the OLD bolt. If that fails use a new bolt and new barrel. No GO or NO-GO checking, just FIELD. There's no concern about a NEW bolt in an old barrel. Heck it's going to be larger -- no wear -- than the old bolt and there will be less headspace.