That would be the best option.
Another option would be re-interpreting gun rights in support of the "well regulated militia" portion of the 2nd amendment. You want to be part of the militia? Cool, keep your guns at this local facility, and only have access to it for training. Otherwise, possession of a gun is made illegal, with strict civil/criminal penalties. Confiscate all the ammo and end domestic production of guns sold to non-militia civilians.
In case the President of the United States becomes a tyrant, and is backed by every section of the military (including forces home and abroad), and state national guards, if you want to go all Rambo against that, here's your gun.