Na, Kishi is gonna write a closing arc set around 4 years after the war just to show how everyone's doing, then that way they can fight Orochimaru for the last time, then end it.
Only if kishi brings up a villain stronger than madara and obito....which in my point of view woukd seem a bit lame....cause both obito and madara have adequate powers to be referred as the ultimate villains......so....