As things are shaping out, it looks like Sasuke's main opponent will be Madara. And Naruto's will be Pain. At least initially.
I have a hard time seeing Naruto even put a dent on Pain. I agree that Yamato will be good for Naruto, but there is little time for that now. The battle to take down Akatsuki is now, it will not wait for 3 more months of training.
Even with Jiriah's death the only way Naruto could be useful against Akatsuki will be if he gets a lot of help from Ma and Pa toad, and from Kakashi. Hopefully he won't get in their way by rushing off dangerously on his own and making them have to protect him. As for Naruto learning new seals and Jutsu's, Kishimoto has so belittled his IQ that it's scarcely believable that Naruto will suddenly be performing high level maneuvers.