Drilling out the rivets should be straightforward. Use a sharp 4 mm drill until the head comes off and then, if necessary, use a parallel punch to knock the rest of the rivet into the tube. The only problem that might occur is if the pop rivet 'nail' is still showing in the rivet head. This will stop the drill centring so use a smaller parallel punch to knock it back