You are correct and bring up a very important point - one that is almost universally ignored, purposely obfuscated or misunderstood. "Regulate", in the language of the Constitution, is most accurately understood as "regularize" or "standardize", not as intending control, restriction, limitation or infringement. This applies both to 2A as well as the Commerce Clause.
One major characteristic of 18th Century battle is that your infantry had to operate like clockwork. Everybody had to load together and be ready to fire together. You could NOT have somebody loading volatile gunpowder into his musket standing next to somebody firing and sending sparks everywhere. When the rate of fire of a company was limited by the reloading speed of its slowest member, there was a great interest in making things “regular”.