I'd go with the first of those two because its smaller barrel diameter is barely bigger than a rivet diameter so it might fit into the old rivet hole. And you should look for truss head screws instead of pan head screws because the head diameter is bigger and you wouldn't need washers.