Well, I'm with you about puns, association, word play. Richard Lederer's books (Anguished English & the rest) [ http://www.verbivore.com/ ] are a scream -- misplaced modifiers, hilarious vocabulary errors, etc. from actual headlines, church bulletins, student papers, etc.

Then there's absurdist humor, like Monty Python.

Lately I find Lewis Black's "raging/ranting" humor right-on http://www.lewisblack.com/ --- he skewers political and cultural madness!