So the anime has been occasionally dipping back into Canon over the last few months. I didn't really check in for the Kaguya stuff, since she wasn't exactly my favorite development...

But I've heard good things about the final Naruto vs. Sasuke battle. Apparently the first of the two episode special is pretty flashback heavy, but by the time you get to the second it gets pretty awesome, with panel by panel adaptation executed well and additional battle scenes like Sasuke using Kirin again added.