Agree with OP, but not only that.
5. Remove super long windup for spear attacks. No matter how spear is held in neutral, overarm or underarm, it's ready to strike. Should you press attack button - character should start a thrust immediately!
6. Especially in two-handed mode, spear is super fast and nimble weapon, thanks to leverage. You can easily thrust 2 times per second in different parts of opponent’s body, keeping them at distance. And leave one directional input (up or down) for extended powerful lunge.