Feel like a really intuitive and easy fix is:
Doubled Standards: from Discipline -----> Tactics
Empower Allies: from Tactics -----> Arms
+5% crit: from Arms -----> Discipline
Boom done 3 swapped traits in their rightful places; simple.
Should have been "Paragon" elite spec for PoF instead of spellbreaker with Spear/Shield with shouts. Missed opportunity here, but would like to see it at some point.