@bevanthomas
Yes, Aesir, Vanir and the more diverse Jotnar which might include "murky elves" (mykálfar or myrkálfar), giants and demi-gods (Loki, Skadi as you mention) like Aesir & Vanir. Elf is often translated as Dwarf, but it's only the Black Elves or Dark Elves (Svartálfar and Dökkálfar) that are like Dwarves, and they might not be actually Dwarves. There are also Light Elves (Ljósálfar) which seem a little like "flower fairies", though without any mention of wings.