Naruto surpassed Jiraiya in power/strength, but did he as a shinobi?

Personally, I think not. Naruto lacks the same diversity, intelligence, and cunning that Jiraiya possessed. It’s undeniable that Naruto is stronger, but I think that Jiraiya is the better shinobi.