During this Arc, I was enjoying how this mystery was played. This Arc is a Mystery and therefore should be looked as a mystery. Most mystery books and movies always have plot twists, betrayals, and a handful of action among suspense. For those who review the episode based on animation, you have to understand that there are different animators for different episodes. So while one episode looks good and the one after looks subpar, this means that there's the one animator that needs improvement.
Look at Dragon Ball for an example of multiple animators. Piccolo Jr's appearance changed a lot throughout the 23rd Tenkaichi Budokai. Super Saiyan Goku's hair especially is a result of animator differences.
Back to the episode at hand, I thought this was a nice way to end this. Everything is solved and Toki becomes Daiymo. The fight with the Ronin was pretty ok. Naruto being scared of ghosts cracks me up. XP