The 10th Amendment was passed to clarify that if the power was not given to the Federal Government in the Constitution, that it did not have said power, and the power instead belonged either to the States, or to the people. It did not relegate the States to being an echo of the Federal Government.
Now...that being said, I think a fair interpretation of the 2nd Amendment in context with other powers granted the FedGov would be each that the FedGov is prohibitted from "abridging" the "right of the people to keep and bear arms", both individually, and in a militia, and that the States MUST NOT interfere with the ability of its citizens to properly train and maintain a milita available for the FedGov to "[call] forth [...] to execute the laws of the union, suppress insurrections and repel invasions".
I don't think too differently than you on this subject. Perhaps some difference in empahsis since I live in the PRK and am one of the citizens the state of Kalifornia is attempting to disarm (i.e. I own a semi-automatic firearm with a detachable magazine and a pistol grip).