Re: Switching out bolts
When you use a bolt with a barrel/extension, they work into each and "break in." If you go back and forth between barrels/uppers with the same bolt, the bolt will continually be in a break in process, meaning that it will just keep wearing.
For the modest cost of a new bolt, I'd just get a new bolt and keep the bolt with each respective upper. Of course, you could just swap back and forth. You might not shoot enough for it to matter.