I think humor is warmer, and wit is colder. Wit is judgment, whereas humor invites some sort of response.