That's a really tough choice. They all have pros and cons. The hubz and I have been discussing it now for 20 minutes. I'm gonna have to think on this a while.
If I may add my two cents (both of which were stolen from Max Brooks, Master Zombie Author) and suggest a Shaolin Spade. Much like a shovel but weaponized and having extra length. For up close a Trench Spike - designed to puncture the brain of soldiers in WWI. For distance I cannot imagine wanting anything else than a rifle with a handgun for closer work.
The main disadvantage of my melee weapons is they both would require special training and you'd have to make sure you got real ones, not brittle replicas.
Not that I've spent too much time thinking about this. Heh.