Here's a choice of solutions: Either buy the gun from somebody you know personally, or pay to have a used gun #'s "run" or just buy NEW!
Any new law is an invitation for the other side to exploit the situation to our detriment. Just my .02.
I had five rifles stolen from me once. The detective on the case recommended that I report the numbers to the BATFE. I told him there was no way I was going to deal with those ... Well, nevermind.
Fortunately, the detective recovered all five for me.