A well regulated, non-federal militia, which is necessary to the security of a free State, shall at all times exist for all States and Territories. The right of the people to Keep and Bear arms shall not be regulated or removed.
Perhaps.
I still think this version is more to the point.