Maybe make javelins be longer and use the spear moveset(heavy attack becomes the light attack, and the heavy is the throwing). And then split the spears into pikes and pole arms.