I think that's exactly where they're going. Lore and Data will merge into one. Geordi will figure it out somehow.
The fact that Data is back, at least to me, just shows how unique a synthetic life form can be. Data reborn from a literal data backup. Something that cannot be done with a human. It's the sort of thing that I hope they explore more of and is very Trek at it's core. I really dig it.
Picard and Crusher making the decision to execute Vadic, especially while she's clearly listening in, was some pretty powerful stuff. I read this morning that of everything that was discussed and debated in the writer's room, this was the that was the most, nearly up to the point of the episode being aired (which makes me think there was an alternate scene filmed where they went the other way). The fact that both were willing to compromise what they've believed in and fought for for so long to protect their son, the ships crew, and potentially all of the Federation is the exact kind of morality play I love to see in Trek.
I do have two minor complaints. Why are all phasers now "pew pew" phasers and not beam ones like we've come to know in TNG for so long, and why did some shots vaporize changelings but others don't? If you're looking to kill, so there's no reason to set your phaser to "sort of kill" for some and "no, really, u die now" for others.
I also think it's a little weird how Changelings are basically holding back every time they fight. They don't shoot their phasers as aggressively (especially the scene where the one was chasing down Sydney and had five seconds of time with the easiest shot in the world, but didn't bother), and they also fight with hand to hand combat instead of making a sword out of their arm, or something else point and hurty to stab with. I get it, service of the plot, Hollywood, yada yada, but considering how well crafted and considerate of avoiding dumb stuff the season has been so far, it's pretty glaring.