Halberd. Just like the idea of a poleaxe that doubles as a spear when needed. That... or a crossbow. Maybe something similar to what one of my characters use where it can hold and shoot multiple bolts before needing to be fed more (think theirs could fire off 4 or 5).