I have agree. In fact…the entire scene on the train—even the scene where John is kidnapped--at each step I just kept thinking that Sherlock was going to come out and admit to having staged it all to get a reaction out of John…just like he did in the Hounds of Baskerville. In that episode I really couldn’t stand the part in the lab where Sherlock tormented John just to prove his theory.
I spent most of the latest episode worried that all of this was part of Sherlock’s plan to get some sort of reaction. That really tainted my opinion of the episode. However, I will re-watch it. I may enjoy it better now that I know the terrorist plots were real...though he still lied about not knowing how to stop the bomb...