I agree, though I think that should be left up to each state. If the state wants their militia members to take their arms home for just such a reason, I have no problem with that.
"Here's a really wild notion: they're really pretty much the same thing!"
Not according to Hamilton in Federalist 29. He thought there was a big difference between "all the militia" and the select militia -- that being the select militia was organized, trained, and disciplined, with officers appointed by the state.
Whose arms?
Who selects?
If the state chooses who participates, and owns the arms used, then they’re not “the people” and no “right” is involved - they’re agents of the state using state-owned equipment, exercising a state power.