Maybe, or maybe we can simply use the logic and common sense of the inherent bracketing of rights as I have described them. However, if you were interested in a more precise amendement, I would recommend you use my discrimination arguments above.
The discrimination-test will allow for individual possession of laser, plasma, and other directed-energy small arms that the present interpretation of the amendment may not allow. The courts are likely -- at present -- to deny possession of laser pistols to the common man, and I find this to be an abhorrant future probability.
When lasers are outlawed, only Klingons will have lasers.
The only problem I have with that idea is that I don't trust the courts to make "common-sense" modifications of the law, any further than I can throw them (all of them). As it is, they're already quite happy to rearrange the law to their aesthetic sensibilities; I don't want to encourage them any further.
And like I said earlier, even if an amendment isn't passed, the states still have all the sovereign powers they need to protect our legitimate rights.