My favorite sub-genre of Science Fiction is Cyberpunk. I never used to read Fantasy, but now, my Favorite sub-genre of Fantasy is "New Weird" which is generally darker than what I always thought of as Fantasy. It leans toward Lovecraftian horror, and I mean that in a good, fresh, revitalizing way.
My favorite sub-genre of science fiction and/or fantasy is Kelly Link.ByeMarco
I know you've read Waldrop, so I assumed you've read "Mary Margaret Road-Grader," but since you didn't explicitly mention it, I feel obliged to link to it.