Yes, I would recommend replacing the uneven rivet. That is a more difficult place to drill and replace since you cannot reach in to support the flange. Make sure you drive the mandrel down to accommodate easy drilling, use a sharp bit and drill slowly. Before you pull the new rivet make sure the skins are snug to each other and there are no chips in between the layers. Hope this helps!