If weapon styles were tied to the weapon proficiency. Each could have a few key moves and not be locked into such dogmatic instistance as a greatsword must be used with two hands.
Alternatively styles could be disassociated from weapons and become more about movement, positioning, and...