Did Kishimoto make a mistake?

By putting Naruto through this ever lasting war? It feels like last minute monetizing of a good brand before pulling the plug and ending the series. I think all the mysteries and secrets have been pretty much revealed so there's really nothing left to wait for in Naruto. Kishimoto had a good run, but there's no more gas to keep passengers entertained.

I'd like to see Naruto to end already and wait for Kishimotos next title: hopefully it will be as good as Naruto in its early years.