One thing I'd like to add to the first post is the disengagement combo :

Yaten > Enbi

Yaten doesn't break combo as a matter of course but Enbi does. So if you're disengaging using Yaten mid-combo, DO NOT immediately use Enbi, finish your combo then use Enbi, I know that it's kinda stupid using the range combo at melee range but...