Second this, rivets are only removable via drilling them out. Use nutsert/rivnut tool and install a threaded rivet that can be used to put in a bolt. If we are talking replacing a self tapping size a M6X1.0 with an 8mm head would probably work as they are similar to a 5/16 self tapping in size/dimension.