Shield Swipe is fine as it is, its a buffer to prevent us from TP starving once our threat is stable. Putting it off GCD will cause happy triggers to go TP starved faster and put the distance between tank DPS even further between Warrior and Paladin.

You can opt to have enmity increase but it should not be a get out of jail free card which is not on a CD and cost so little. Cause Warriors have 2 enmity increase skill, giving a flexible 3 one to Paladin is going to rock the balance.