Peterson marker lights

[Stinnett21]

I wonder if I could get some help on side/rear marker lights. I have a 2003 trailer with the Peterson 150 marker lights. These are the style that are fastened by rivets and rely on the riveted connection for ground. Some of them aren’t working and through investigation I believe they have lost ground due to the age of the rivet/corrosion etc. Through other posts it appears the recommended fix for this is to drill out the rivet and replace with an appropriate size screw where the threads can bite into the metal. I’m an hour and half from my boat so I’m trying to prep for an assault on the marker light front from a distance. My question is, will the head of a standard screw prevent the light from snapping back into place or will I need a specialty low profile fastener? I would appreciate input from anyone who may have encountered this issue.