IIRC even Jiraiya said that Naruto is strong right now (when he's giving warning not to use the dangerous technique).. so, I think Orochimaru is going to get some surprises when he fight with Naruto.. but, in the end, I still think Sasuke is stronger, he's much more determined and he got that sharingan thing.