Definitely humorous in its underpinnings.

Peeping Tom, I think, is not funny.

Both films subvert the notion of a protagonist (Psycho with a fluid architecture of protagonist and antagonist, Peeping Tom with its gradual depiction of the protagonist's goal--it's not to kill people). Would love to see your analysis of the Michael Powell masterpiece.