I also taught close quarters combat in the Infantry and could not agree more with your comments.
I would also advise people to learn how to use a knife and carry one as well. I know some idiots will “stand up” to a gun because of what they see on TV. But only the most determined antagonist will attack someone holding a knife, esp if the holder knows how to use it.
I don’t know how many times I’ve told my boys the same thing. A knife in capable hands is far more dangerous in close quarters combat.