At the minimum we need a clarification from the courts precisely what the Second Amendment means in today's world. I believe its original intent was to deny the federal government the power to make laws that restrict the right of individual citizens to own and carry weapons of all kinds, with the stated purpose of preserving the ability of the states to muster well-equipped militias trained and able to fight effectively.
It was then as it is today up to the states to manage their own state militias. I think a lot of my fellow Californians are not aware that the militia is not just the state National Guard. Even today we are all subject to being called up for militia duty by the Governator if he declares a state of emergency. For example, if a large earthquake caused a major disruption in infrastructure we could all be conscripted with a stroke of his pen.
From the California Military and Veterans Code:
120. The militia of the State shall consist of the National Guard,
State Military Reserve and the Naval Militia--which constitute the
active militia --and the unorganized militia.
121. The unorganized militia consists of all persons liable to
service in the militia, but not members of the National Guard or the
Naval Militia.
122. The militia of the State consists of all able-bodied male
citizens and all other able-bodied males who have declared their
intention to become citizens of the United States, who are between
the ages of eighteen and forty-five, and who are residents of the
State, and of such other persons as may upon their own application be
enlisted or commissioned therein pursuant to the provisions of this
division, subject, however, to such exemptions as now exist or may be
hereafter created by the laws of the United States or of this State.Since I am over 45 I am exempt from conscription but still eligible to serve should I decide to volunteer.
See
http://www.leginfo.ca.gov/cgi-bin/calawquery?codesection=mvc&codebody=&hits=20 for the table of contents for the Military and Veterans Code.
Back to the original question, if it is still in the purview of the states to decide the extent to which they want members of their own unorganized militias (i.e. the people at large) to be armed in the interest of having them available to serve at the pleasure of their governors then I would say all federal gun laws other than those concerned with interstate commerce would be unconstitutional.
My personal preference would be a simple clarification of whether or not the proscription against infringement of the RKBA applies to the states as well as the federal government. A lot has changed since the 18th Century. We have the National Guard, we have a standing army, we have more technologically advanced weapons, we have civil police. None of that existed when the Second Amendment was written.