Well, Kakashi and Baki have kinda always been dispensable to me? When I use them, they die far too quickly, and Baki's mystery attack lowkey *s. If I were you, I might switch out Kakashi for Suigetsu. He's really, really good at 4 stars. My line up currently consists of (all 4*) Naruto, Kisame, and Suigetsu. The only thing is Suigetsu doesn't combo w/ Water Main.