Nice update.
All that's needed are the speed buff on high damage polearms by a few points, damage buff on the low damage spears by a few points, and reduction in the speed penalty for hoplites (the damage reduction can go, too, but it doesn't matter too much).