The right is individual but Heller and Miller both still reference the Militia clause, even though Heller holds that the right is individual.
Miller defines the arms that are protected. Heller further defines it. Neither does so enough yet. I think that's the next major hurdle. Right now we have an individual right to weapons in the general use fulfilling a vague militia like purpose.