The rivet issue is a red herring, pop rivets are fine, no one willl call you on it at a DMV (if they remove your dash pad to l ook).
Check these guys out, they will reproduce, and if a corroded original is replaced no fraud or intent to decieve is in play so the technical (and never ending)...