i would suggest following musahi's aproach outlined in the jhi thread mentioned above.

replace the animation of polearm units with the milita halberd animation and two handed axe untis with the jhi animation.

im not comfortable with lusteds fix as he changes alot of variablesto try and balance things and i think its too much.