I'd second that recommendation, but be warned that some of the humour is very black.

A good place to find some recent high quality fanfic is here:

http://www.altogetherelsewhere.net/multiverse/

Of those I've read, Colorblind and Travel Light are especially fine.