I second many of the recs listed above, and because I don't think he's been mentioned, I'm going to add Elvis Costello. He has a large catalogue, but a good starting place is The Best of Elvis Costello and The Attractions. Smart, funny, lovelorn, angry--he covers the block, and writes great songs. Equally brilliant at lyrics and melody, which is unusual--kind of a Cole Porter of modern punk pop. I think he might be someone you'd enjoy.

(and also, Prince--has anyone mentioned Prince? if you want to shake your ass and dance, there's no one finer.)

eta: sorry! fixed the link.