[Nathan Slingerland]

Yup - some really good advice there.

What does your bolt extraction tool look like? Do you think something like this would work?
https://www.amazon.com/Irwin-HANSON-Spir...B0002NYBH8

[EdHolland]

Another thought for this task would be to use an eyelet plier. They should provide much less force, and only at the rivet ends. Pop rivets expand when installed, which is often why they cause breakage of brittle materials.

Searching a little did bring up hollow and tubular rivets, I did not investigate the original sizes.

For the plug on our 16X, I carefully pryed open the rivets, rather than drilling. I was then able to use them again after replacing the wires.