Nice job.

Gluing plastic with epoxy has always been a challenge. There are so many different plastics. I suspect the plastic of the pbsf is either ABS or Polypropylene. Regardless, the rivet should hold. You might find some free play after numerous cycle from removing the light. If you do find yourself having to remove and pop in some new rivets, I suggest adding some glue along with the rivets. JB weld, abs glue or even some acetone to help fused them together before riveting should last a long time.