I think we shpuld actually go back to muskets.

They are the combination of spear and gun after the era of pike and shot.
When you put a bayonet on that thing you have to wield it like a spear at close range.

Gun fights would be alot more interesting.