May I recommend Sylvia Townsend Warner's Kingdoms of Elfin stories? Rather hard to come by, but several are reprinted in various anthologies of her work. They are a series of unrelated stories about different faerie kingdoms from the 1600's onward. Very sharp, cool and witty. Well worth the search.
Alex