Just a suggestion but The rivets had to be drilled out to begin with right?
I did the exact same project but rather than riveting the assembly back together I used stainless steel screws.
You can alsways reverse a screw but you have to drill out and replace a rivet. The holes are behind the lenses and the rear of the light socket is Steel.
No extra tools required for screws, just good old screwstick. A rivet requires Drill, pop rivet gun, drill bit and finesse.
I use screws anytime that I can. the only place that I use rivets is where they are cosmetic or if I have concerns of Galvanic reaction. Galvanic reaction is a relatively slow process.
Just a suggestion,