I mean, I don't think of that as a problem? I really don't think PIC ever needed to revert back to the heroes-in-Starfleet model. If I had been hired to run S2-3, I don't think I would have had Jean-Luc return to Starfleet. I think I would have had it focus on the relationship with Jean-Luc and Soji as surrogate granddaughter/grandfather, probably would have had the "home base" for the series be either Chateau Picard or Coppelius, and the crew of La Sirena would have continued to be supporting players.