I would remove "Whom Gods Destroy". Even though it has a few funny moments, the overall tone is kind of dark. Insane asylums aren't funny places. And Marta gets blown up, which is also not funny.
"Plato's Stepchildren": I don't find anything enjoyable, or remotely funny, in this episode.
"The Naked Time": Riley's scenes are funny. Everything else is fairly serious.
Incorporating a little comedy into an episode does not make it a "comedy episode". In order for that to happen, there can be no real danger to our heroes (i.e. "Tribbles", "Action"). I don't think there are a total of ten comedy episodes in TOS.