The other option its make Sword Oath a Buff with time and for more time active you need to use Shield Swipe for... i dont know... +15 secs?, but in this case you should make Shield Swipe OCD with 15 secs cooldown or somethign like that and reduce the potency i think. ( im no good at number xD)
