When I get grumpy, there are two sure-fire ways to cheer me up.

1: wrestle/spar with me (and no, I don't have to win for this to work, just feel like I've gotten in at least one decent shot)
2: show me pictures of kittens.