I actually thought they did that well, but like you, we said to each other when they all got in the car and drove away....BOOOM!
The twist about the bomber was an interesting one too....so she was never going to blow herself up on the train, it was all to lure him into a hero situation to get...