But yes, the fact that he denies feeling emotion after showing emotional reactions (prime example being after the old lady was blown up) shows he has them, he's aware of them, and he's unsettle to the point of denial.

Very good point. I hadn't thought of that but I spent a bit of time rewatching the end of 1.03 and Sherlock's clearly emotional reaction to John being in danger.

As for post-s2, I still haven't got around ot seeing it (at this stage, I'm just going to wait and by it at JB HiFi) so I can't comment. Yet.