Oh, definitely the ENT finale. Seeing Frakes and Sirtis filling out (and how!) those uniforms and trying to convince us they were back in good old season seven was just plain wrong, especially given it was an actual canon episode and was supposed to depict actual unseen events that took place during "The Pegasus" (yeah right!).
By complete contrast, Shatner's thing was just a harmless bit of fun.