Tangently, Elf/Dwarf animosity has never made much sense. Dwarves need to come to the surface to get food, and elves need to get ore from underground. Also the "loves" of dwarves make no sense, you live underground, but you find pretty rocks valuable?
Anyway, both directions I'm going could be...