I rewatched the 2nd part of Best of Both Worlds last night, and I am 100% convinced now, that this is my own personal series finale. There is no way to fix it. It sells out its entire purpose, the arcs of the entire movie, and every character within it, to return to the status quo so quickly.
That's too bad, there's much awesome stuff after it.
From our perspective it took only a week for Picard to recover from his experience, what about in Star Trek land? There was episode 'Family' where he went through his experience. After that it could have been a longer period of time before the events of the next episode happened. Let's also remember Picard has access to medication and therapy from 24th century.
Also, Riker received a field commission for captain, isn't that like.... not a full official captain?