Still not good enough. All free persons have the right to keep and bear arms, free of any burdensome rules or restrictions. CIVILIAN DISARMAMENT SHALL CONSTITUTE TREASON.
I think that Mr. Madison (and those who shared his views on the matter) would simply have said, "The right of the People to keep and bear arms shall not be infringed", were it not for the need to appease the landed gentry, and the other would-be aristocrats, who might have seen an armed citizenry as a threat to their wealth and power. Adding that unfortunate dependent clause about the "militia" was, IMO, designed to assuage the fears of the slaveholders and the mercantile class.