Honestly I think you could also replace Baki in the Wind Path main with Naruto, especially if you get Sage Naruto. I would use Gaara and Kankuro definitely, especially the GNW version. I think Kazekage Gaara would be good too.