Sadly, the Armoury system only ever allowed the illusion of choice. It's much less exasperating and confusing gameplay-wise if every action actually has a consistent, coherent meaning, and there's still reason to level other classes for their abilities.