Honestly - a lot of the K11 are reaching the point where they will have their genin team structure broken up and they will be put in charge of their own teams or be part of teams compiled especially for higher ranking missions.
Though, honestly, if you were to simply let Kakashi rotate out of the team and put Sasuke back in where Kakashi was - you'd probably have about the most seamless Team 7 restructure, right there.
But that really depends upon what we want Team 7's structure to be built for. Currently - it seems to be built as an 'assault' squad; comprised of heavy hitters that can take the heat of being at the tip of the spear (although, at this point - Naruto and Sasuke could seriously **** up an entire village each on their own...).
Though it's not really all that apparent that there's a future need for ninja, to begin with. Bringing an 'end to the hatred' and all that jazz will largely reduce Ninja to being domestic and highway police. Unless there's some kind of utopia to be made... in which case the existence of ninja and ninjutsu seems a bit... unnecessary.
