Nope CSIangel, the "I could really just kiss you right now" scene is in Organ Grinder, back in S2 (?) I believe. Who Shot Sherlock is S5 where Greggo passes his final proficiency test (and Sara hugs him again!)
Yes sandersidle, I am still spoiler free, and extremely happy about it! See --->...