I mean it really depends, I have a funny but dumb boyfriend so i pick more twords that side, but it really depends on the person bc they could be messed up getting to know them, the angry one might open up...? or may never change. i would say get to know them a bit before you choose.
umm i would pick the funny one because i wont go chasing the one who could be really rude ( speaking from experience ) but the heart wants what the heart wants!
I mean.. I've met some funny people who are really nice, but I prefer smarts.. and dumb humor.. can go very very wrong. Maybe it's just that I have a bunch of the "funny (sometimes funny) but dumb" people trying to chase after me for the last two years.. and harassing me.. so I'd rather the smart but angry, though my "crush" (still think crush sounds like you want to harm them) is someone who's very smart AND funny so I'm not sure there..