Witty
Part of speech: adjective
Definition: Wise, having good judgement. Possessing a strong intellect or intellectual capacity; intelligent, skilful, ingenious. Clever; amusingly ingenious. Full of wit. quick of mind; insightful; in possession of wits
Example sentence: One cannot be always laughing at a man without now and then stumbling on something witty.
Humorous
Part of speech: adjective
Definition: Full of humor or arousing laughter; funny.Showing humor; witty, jocular.Damp or watery.
Example sentence: I have seen and heard comedians who had really funny 'stuff' but yet could not make the people laugh; then, again - I have seen others whose stuff was anything but humorous, and the audience would howl with laughter.