in the BBC version, Sherlock had a very legitimate reason to fake his death

I was thinking the same thing. I am probably the only person who doesn't really want John to punch him; physical violence isn't going to make however many years they make it worth of emotional trauma feel any better. Yes, I want John to be angry because he has every right to be, but I'd much rather see him verbally rip Sherlock a new one and then hug the stuffing out of him because John did, after all, ask Sherlock to stop this and not be dead. But, since they're men written by men, I'm sure there will be punching.