Also, did TNG really have straight comedy episodes? TOS obviously did, with entries like "The Trouble with Tribbles" and "A Piece of the Action." DS9 had tons with episodes like "The Magnificient Ferengi," "Who Mourns for Morn," "Badda-Bing, Badda-Bang," etc. And Voyager had ones like "Bride of Chaotica." But right off the top of my head, I'm having a hard time think of TNG episodes that were just comedies.
"Q-Pid," perhaps? That's pretty much of a lark, and maybe "A Fistful of Datas." Any episode in which Brent Spiner ends up in drag, playing a saloon girl, isn't exactly taking itself too seriously.