Anyway I would change the movie, instead of it being Naruto and hinata versus toneri it would be Naruto and sasuke with their seals intact (didn't lose arms, or lose six paths power) versus toneri who managed to acquire hamura's power. With everyone showing off their new abilities but the main point is kept toneri still kidnaps hinata and Naruto and hinata fall in love and whatnot and sasusaku happens but that's not the center focus. As Naruto and sasuke face toneri we see that Naruto and sasuke have improved in their mastery of the six paths power but still prove to be outmatched by toneri despite holding their own for awhile. As toneri begins to grow stronger by absorbing more power, naruto and sasuke combine hands to create something new, through six paths yin and six paths yang their powers become greatly augmented (thanks to yin) and their durability and life force is greatly enhanced (thanks to yang). Sasuke, acquiring another rinnegan and naruto gaining a new cloak and the powers of the tail beast (including unrivaled strength) puzzled that he is getting beaten by naruto and sasuke, toneri with hamura's power manages to crash the moon into the earth before he is finally defeated by sasuke and Naruto with their enhancements of the six path techniques. After the destruction (and much contemplation) Naruto and sasuke once again join hands and bring about the creation of all things and manage to reverse all the damage toneri had done (albeit with strain because you're reversing damage on a global scale), toneri sees this and gets TNJ'd by sasuke then gets PNJ'd by naruto and he regrets their actions hamura's chakra comes forth showing a chakra being hamura much like his brother. Hamura delivers the final dosage and Six Paths technique:Minister No Jutsus toneri, he gives a lesson to naruto and sasuke (who have now deformed since the change was temporary) and notes that hagoromo's descendants have done well and whatnot, he shares his power with naruto and sasuke after deeming them worthy with sasuke acquiring a new eyes that remain unnamed, and naruto gaining more power. Hamura explains the reason why his mother needed an army in the first place, and tells narito and sasuke of the impending doom that awaits them. However it is not yet that they come but "soon" which pretty much in movie time means not for a long while. But they get sent home and naruto and hinata have their moment and sasuke disappears into his desert scene with Sakura looking puzzled but sasuke left her a note much to her enjoyment. Roll credits the same way but we get a teaser if this new movie explaining the threat and the origins of the ootkuschi.