The right of the people to keep and bear arms shall not be infringed.
This will make it simpler and less likely to be misinterpreted.
When the oligarchs truly have the vote system completely in their control, they will have a Constitutional Convention and carve weapons possession out of your rights. Count on it. They have a well thought out agenda to conform you to.
I don't think that is necessarily true. Anti-gunners would just claim that the Constitution was not a suicide pact and it is obvious that our Founders never intended for the people to have "assault weapons" or weapons of war. In fact, they have already done this.
There's something quite ludicrous about locales where an otherwise legal rifle can be made illegal due to the presence of a bayonet lug. Not a bayonet; just the little piece of metal that allows one to attach a bayonet.
It's also quite ludicrous that we have laws favoring the disabled requiring businesses, sometimes at great expense, to install wheel chair ramps. Yet at the same time we outlaw pistol grips on rifles because they would allow one-armed operation.