I agree. IMHO, hand to hand fighting is similar to being able to start a fire using a hand drill: I usually use my lighter, if that fails I have a ferro rod, as a last resort I can always fall back on a friction method because it's a skill I have developed & maintain.
In a true confrontational survival situation my perferred options are 1) avoid, 2) firearm, 3) blade, 4) other weapon, 5) H2H.
Note- avoidance is a pretty broad tactic, it covers pretty much everything from situational awareness, being a "hard target", bluffing, talking your way out of a confrontation, etc.
I'd swapp 3 & 4. But other than that, I agree with your list.