Worth mentioning that Shield Swipe now increases enmity, so using it isn't an aggro risk anymore. I'm surprised you're having more TP issues than before though