I'm a sucker for this kind of hurt/comfort, and you just pressed all the right buttons. Watson being brave and stoic, Holmes seeing right through him via a collection of ridiculously minute details, and the two of them eventually incorporating it into their unspoken teamwork - fantastic.