I'd remove them, especially if they've been thermal coated. Odds are the coating shop blasted them with some form of abrasive, which never gets thoroughly cleaned out unless you remove the baffles. Take a hammer and chisel and knock the rivets off, then drill and tap for 6mm x 1.0 fasteners. I...