Well - I just went through similar effort. I suggest you make the decision with the bedding hogged out. The action orientation is fixed by the guard screws, so you dont have much room to move axially, unless the receiver was binding in the stock, and causing the action to shift in the first place - Do the guard screws bind currently?
In my case, the trigger guard was interfering with the stock, causing it to cant slightly. This also caused the action to cant via the action screws. The canting caused the barrel to shift axially, as yours is. I relieved the interference and voila, problem solved.