I agree with most of your points, but Naruto vs Pain, highlighted Naruto"s plan and intelligence to a great extent. Nagato was the pompous one who did not plan, but Naruto planned.