At some point, when I get around to it, I'll design and 3D print myself a bolt buffer from a semi-flexible plastic.
The easiest way to deal with the gas block would be to mark the barrel under the setscrews and then dimple those spots to allow the setscrews a mechanical lock to the barrel. Drilling a cross pin into the gas block and barrel will be WAY more difficult than you think. It is not something you are gonna be able to do with a drill press and simple drill bit.