Need a definition of “militia”.
I say it is “the people”. Which makes the original Second Amendment fine the way it is.
If you define “militia” as a some sort of government body (”National Guard”) then the right to keep and hear arms against government tyranny (which is what the Second Amendment is all about) just goes right out the window.
Not to mention that it's nonsense to have an Amendment in the "Bill of Rights" guaranteeing the government the "right" to arm its own troops.