I don't know anything about removing the barrel but the headspacing is on the rim so if you action will close I do not see how you could have a headspacing problem. If you replace the barrel it still should have the same relationship to the action.
Shoot us some pics when your job is complete.
Shoot us some pics when your job is complete.