That's the shift I was waiting for, I had the exact same feeling. They could pick like any two storylines in the movie and cut them completely and nothing would have been lost, but at the same time it was really fun.
Really liked the first 1/2. Didn't care for the last 1/4 of the movie. Haven't seen anything between this and alien3 so maybe I missed something. Big fat meh.