Best weapon

I think most folks would agree with me that the cornerstone of any piece of 'survival' equipment is versatility. Everything in a good kit does more than one thing well - it's the key to covering all your bases with minimal weight, ensuring redundancy in case you lose a portion of your gear, and accounting for wear and tear.

With that in mind, batons are right out. They're only really good for one thing that I can think of, and that's smacking people around. Besides, there are plenty of individuals in the world who, through sheer body mass, muscle density, and bone structure, can just shrug off multiple baton blows and keep right on coming. God help you if they're tweaking - that baton will just make them mad.

A better choice would be a very durable folding shovel with at least one sharp edge. Few things are more demoralizing than having to dig a big hole with a small knife, so having a portable shovel is a very good idea anyway. Add in the fact that it gives you a very sizeable reach advantage over attackers armed with knives, and what more do you want? How about the fact that it works splendidly as a hammer (much better than a knife pommel), an axe, and even a saw if you get one with a serrated portion?

The shovel doesn't sound very intimidating, but believe me, you would NOT want to try to poke me with your wee knife if I've got my shovel out. Mine is beastly, it's got two good edges, and more inches of edge than any two knives/hatchets I've ever owned combined. I have used it several times to split coconuts - one good stroke, or two. Try doing that with an extending baton.

A sturdy cane/walking stick or umbrella is also not a terrible choice.

Every survival kit has at least one or two good knives, but the idea is to outreach the opponent and keep them far enough away that they pose no threat to you.

Of course pistols are a fine choice for self-defense if you're fast to get on target and a good, quick shot at short distances. I personally don't have one, but loads of people like them and recommend them in a survival situation.

I guess I've never really seen TEOTWAWKI as some sort of wild west, annie get your guns type situation. Maybe I'm wrong, but I don't think so. If you plan on recreating the Mad Max movies, then yeah, you might need that arsenal, but if your plan is just to remove yourself from danger and stay sheltered and fed until things calm down, a pistol isn't strictly necessary, and will just add to the weight you're carrying.