My 2p's worth.
I ground the rivet heats off, drilled them out and then tapped the holes for a set of cap head bolts I found.
I used metric tap and bolts - UK based - think they were a m4 but it was a long time back.
Not sure I that helps but it made painting the parts to match the dash an easy task.
P.