Its ironic in all respects that SP didn't go overboard with 615 in the anime a few weeks ago.
But yes like I said before, if anything were to occur with the timeskip in the coming movie, its just an excuse to set new things up completely having never occurred or existed in the manga, this goes especially for SS and NH.
With SP though, its a hard deal of how much will this go on? I mean part of this is just kishi's writing himself but even for the mess of the whole romance subplot being HInata's deals are unresolved and SS is just a total thematic failure at this point, at least there is a way to end it with NaruSaku in all reasons because of the development, the focus, and hints. Its funny how despite the mess, kishi could still pull NS and make the ending to this subplot have a lot of satisfactory results, hell Sakura doesn't need to get over Sasuke, it could work with her just loving naruto more and seeing sasuke as a friend she cares for, but loving naruto could still make sense.
I don't think it will be as bad tomorrow but SP needs to stop this Hinata here and there kitten, because in the manga beyond this point, she doesn nothing, nothing important or of significance. Literally she is just dreaming right now in the manga, its funny how NH fans said NS fans are in the genjutsu, well look whos laughing now, NH is literally happening in the genjutsu now and it doesn't interfere at all with the stuff of NS, in fact it doesn't even help it, it just further hinders development.
Otherwise I think things will be fine.