Fear not, Beauty! For I am now finally ready...
Carolynn - excellent and very thought provoking topic!
"Humor is always anger with it's makeup on."
My personal take?

I don't think I agree. Humor itself is a very broad phoenomenon, and I feel that humor is something that can be driven by a variety of emotions, thoughts and feelings.
It can manifest itself on an infinite amount of levels. There is no limit to humor. Thjat's the beauty of it. That is what initially drew me to standup. Many comedians over the years have followed standard comedic traditions or rituals, while many others have brought their own brand of style to the table.
In terms of general humor, there is clean and innocent humor (knock knock jokes) physical humor (Three Stooges) and situational humor (the most popular - from Bill Cosby to Jerry Seinfeld) as well as dark humor (movies like Pulp Fiction and Very Bad Things), raunchy humor (80s Eddie Murphy, Howard Stern), sexual humor, and disgusting humor (For example, farts are hilarious to me & I don't think I'll ever outgrow fart humor!!

)
But if there's ONE style of humor I must say hats off to,

it's the classic one liner-humor!! This was the way of the greats like W.C. Fields, Don Ricles, Milton Berle and Rodney Dangerfield. These comics will always have my respect (no pun intended)
As far as my standup routine, for the most part what I do is I just basically tell funny stories about actual situations that I get into as a CD, but I will insert a punchline or two to spice it up!
For example, there's my bit about getting a flat & having to change a tire on a busy expressway while dressed, where someone stops to help and I ask him to help me "tighten my nuts..."

Live it. Love it. OWN IT.