Shadow step for mut and combat, CnD for sub most likely (still going to be a toss-uo). CnD is designed for sub specifically, which is sad.
On top of all that, currently on the ptr CnD does not ignore los and u can still be rooted. The times when you could ignore LoS and not be rooted was not intentional and has been fixed.
Just a heads up.