Reading it again.. yes, I would propose drilling all the rivets out.. that is certainly something I have done in my limited experience, and I did think that was a fairly normal thing to do.