I think that's one of the real beauty points of TRS. Yes the series ended on some bittersweet notes but things were tied up pretty nicely. When I started checking out the trailers for TRS in the months after I finished the series and was waiting for the release, my brain was so excited but at the same time, I couldn't piece together why I was seeing Mami in the trailers for example.
The first twist was definitely made fairly easy to pick up on, I'll give it that. Especially if you're fresh off the series and start taking notice when the city folk of Mitakihara start getting their distorted faces and such. It kind of becomes a bit of a countdown til the real 'first' twist and for my money, that's when the movie becomes something truly amazing.
I admit that I do envy both you and Isi for having the glory of the caught you scene completely unspoiled. Yes I had Homucifer spoiled for me before but bizarrely enough, the trailer for the blu-ray release (which unfortunately seems to be taken down most places so I can't link it here) showed the point where Homura grabs Godoka's wrists. I knew it was coming, but I still didn't know I was about to see one of the finest points in cinema for me. Basically the shock could have been grander without that, but the scene is still just amazing and I still get chills no matter how many times I watch it.
I've spent a chunk of the day toying with the idea of finally putting into proper words why I adore from the experimentation explanation scene right up to Homucifer's 'birth' and why I consider that whole point one of the greatest chunks of cinema I've ever seen.
One of the really nice parts that comes from that point in the Mami vs Homura fight is that it runs off the viewer (and even Mami amusingly enough, well... her doppleganger at least) not taking into account that because her soul gem is positioned in her hand, Homura will be fine a little after even if she pulls the trigger to her head. Did it stop me from reacting the same way? Nope! It was wide eyed and 'Holy ****..' all over the place.