Yeh that's the right one.

Yeh he scales of Nin as well, but his growth in it is much lower then his Atk and you don't want to take away from defensive stats, unless you are not into pvp at all. Then you can just do +atk - defensive stat, for better world boss/strong approach and etc.