The only way to stop handgun crimes, assault riffle crimes is to stop manufacturing/selling them (with the exception of police).
I’d rather see much longer waiting periods, since immediate need of weaponry doesn’t really apply to good intentions.
My solution:
1 mo waiting period. Better background checking system. “Red Flag” point system. And discontinue the production of assault weapons except for direct sale to law enforcement agencies.