If the issue is that you'll always have Kenki to be able to use Kaiten before an Iaijutsu then I'd rather they just nerf Kenki generation. No reason to kill a class mechanic instead.