It's been a while since I put a non-free floated upper together, and for some reason I had it in my head that the delta ring spring went in front of the barrel extension flange. I've looked at the schematic and figured out how to put it all together.
Nevertheless, this still leaves the base question - can you drift out the pins on the FSB, remove the block, and then reinstall the block with the pins and have it all hold together?