I think ENTPs usually have a pretty good sense of humor. ENFPs are pretty humorous too. It depends on what kind of humor you're after. I don't think any type does satire better than an ENTP.
Satire! That best describes entp humour and it so true that entps do it the best and they do so without offending others. On those occasions someone does get offended entps would make them laugh a bit more, using satire yet again. I've heard goofy, flippant but non of them were ever satisfying. So thank you for pointing that out. A new word I learned today. Infact satire is a good way to identify entps. My vote would also go for entp. However not all entps are funny of course. Some are e3s and some others are counterphobic 6s.