TOS for me. Most of the comedy was very subtle (a look, a throwaway phrase) but it was masterfully done.
As with the Ferengi eps on DS9, the only thing about TOS that tarnishes its comedy was the forced "funny" scenes at the end of several episodes. The forced laughter was just painful.