It would be cool if they had something like "Casting Enchanted Riposte grants you Blade Arts for X seconds, causing your auto attacks to deal additional unaspected damage with a potency of Y," As opposed to just having fulltime auto attack boosts, make their melee combo rotation temporarily enhance their auto attacks and make it last just long enough that it ends by the time you displace and go back to caster mode.