Ultimately the second amendment is in fact the problem.
You’re right, it was designed as a “Revolutionary, shooting-at-people law”, but it’s woefully inadequate in that role now. It doesn’t allow you to own a tank or an attack drone, and an assault rifle isn’t going to be enough to stand up against a modern military force. So basically, as a revolutionary law the 2nd amendment is fucking useless at this point.
I say either double down on the intention of the 2nd amendment, or get rid of it. Either amend the constitution to allow civilian use of destructive devices (including tanks, artillery, missiles, 2000 lb bombs, etc) or kill the second amendment entirely. And hey, just go with whichever seems like a better idea to you, no judgement.