I've deleted the secondary attack of spearwall halbers and they've improved a lot. Sword and shield infantry still often gets gets to hit a halberdier. The halberdiers manage to pin down most infantry but they haven't got very much killing power. I think now without secondary weapon it's just right and pretty balanced.