If I had a voice I'd sing
I was editing my post to recommend a spear too, as you were posting. As always with any melee weapon though, attitude is key. With a poor attitude and too much self confidence, that spear will just get taken away and used against you. But if you can be more crazed than the attacker, I think you could make a spear work.A cold steel pig spear might be another weapon to consider for close range.
I have one and it would stop a charging 800 lb boar..