Only tangentially related, but I always thought it would be cool if going into Sword Oath put your shield away and swapped out your shield based abilities for more offensive ones.