Non sequitur.
Where's the conflict? The persons who comprised the militias and were drawn from the populations of their states had individual rights against being disarmed by the federal government. If the federal government had the right to disarm individuals not in the militia, militias could be prevented from even being formed.
There was a recognized individual right to keep and bear arms that the federal government could not transgress. I've never said otherwise.
As anxious as you are for the courts to amend the Constitution by fiat, that day is not yet here.