A quick note about elves: it's a misconception that before Tolkien's work an elf was pictured as a fey. Nordic elves were very Tolkien-ish, for example.
I've read explanations that elves as winged 5" fairies were a Victorian invention, and it kind of fits. European myths from before then generally much more serious.
Even though elves were mostly not fey, many descriptions of an elf are/were quite non Tolkien-ish.