My suggestion - J-B Weld and no extra rivets. I've gone 6 years like that on mine.
The J-B strengthens the entire setup and gives more surface contact.
Ouch though, you didn't get hurt when it let go did you?
I want to be able to use my pole pad.