Or have Shield Bash combo straight into Goring Blade/Royal Authority/Atonement as a (1-3) combo. It would fix the rotation stability and you could do something like Shield Bash->Royal Authority->Holy Spirit with the new buff making it more flexible with mobility.