I'd go for 1h/pole without 2h, you don't really need 2h when you can use long war axe other similar polearms.
Also what Steevee said, having 7 athletics with 24 agi makes no sense. Athletics is much higher priority skill than IF for any melee except pure cavalry.