I broke the extractor on my 338 rum and I want to replace it. I ordered a new extractor and rivet from Midway today. I have stripped the bolt. What is the best way to remove the rivet? Should I drill it out? What size drill? When peening the new rivet, what is the best approach to get the best results? I have seen the anvils for peening the rivets and I will probably make one. Any other advice to make this as painless as possible?