They actually managed to wrap this up better than I was expecting, though I guess we'll see how it holds up on rewatch.
Also between making it Uber blatant with showing us the golem in the previous episode and the show being named Picard I was just outright fucking bored by everything starting with his death until the scene with Data. It was hard to find any of it remotely interesting given it was so obvious he was about to come back. If the show hadn't been named what it is then maybe I would have bought into it a bit despite the golem reveal.