Baking Fallen Crusader into MotFW would solve a lot of issues for 2h like the ability to use all the new Shattered Frost talents and more.
MotFW:
Wielding a two-handed weapon imbues the weapon with Rune of the Fallen Crusader and increases Obliterate damage by 30%. Your auto attack critical strikes always grant Killing Machine.