Naruto or Hashirama
I'm going with Hashirama who have been fighting in constant war since he was a kid. He was fighting grown men and was shown using kenjutsu as well. Naruto's frog kata wouldn't work on Hashirama since Hashirama can sense and see natural energy himself so Hashirama's experience is what puts him on top against Naruto in taijutsu. Naruto is 17 so he have time to improve.