Well, for the most part you are kinda of correct.
But just to point this out.
1. Obito and Nagato at every step of the way were kind of testing naruto to see his resolve, to see what he would do, see his reaction to the situation and test his abilities, it never really seemed to me like pain was trying to kill naruto, and while obito was not the jin it seemed as though he was doing the same thing. When Obito become the Jin he seemingly was test naruto even more, it neever really seemed as though he wanted to kill naruto, as much as he wanted to break him, and make him turn willingly.
2. Sasuke cant push narutos button becuase naruto let go of his hatred. Hate i what made naruto go off, naruto's ability to control his hatred is what saved him, we must also realize that naruto's attitude is different from part 1 and even pre-war, he is much more calm and collective, and even more confident in his abilities. Even more so then sasuke, we have yet to really see naruto over react. He is also more observant than sasuke, still kinda goofy though.
But other then though you are on the right path with sasuke, i think that he will probably be the toughest opponent for naruto to beat because he wont be TNJ so easily, and he wont hold back to see how nartuo reacts (like Nagato and Obito), along with not actually letting naruto going beast mode (like orochimaru). Along with that Sasuke has always had a slight advantage that unlike naruto his "Base" mode is also his "Beast" mode, while naruto actually has to take 5-10 seconds to go Sage mode or any of the various tb modes.