I also would like to voice my opinion that Kaiten is a very fun skill to use and there are several other, more elegant, ways to deal with button bloat.

Don't just take iconic skills away. That's not cool.