Looks like you guys have been busy while I was out today...
Anyways, given the problem with diplomacy tile spawn, we could design our custom units around it. Say, for example, the elven survivors broke up into multiple splinter groups, thus the goal of the diplomacy techs would be to try to unite all the groups together. This sounds like a pretty common elven problem/theme, so it should work.
One such group might be "The Spider Cult", who are experimenting with using spider poison to boost their physical strength. Normally they are outcasted by other elves, but in times of need, they can still be called in for service. Basically a foreshadowing for a "dark elf" plot...
The cult uses "Spider Brethren", who are basically elves corrupted/empowered by poison, they fight unarmed. To train these units they need to build a lab of some sort on top of a Spider Nest. (So this would basically be an unarmed elf with darker tinted skin. Maybe just wear a cloak or something to fit the theme.)
The cult also uses "Shrill Champion", who are basically a more powerful version of the Spider Brethren using captured Shrills. Again, this would need some type of lab on top of a Shrill Hive. (The shrills have more "intelligence" than spiders, so some light equipment and weapons can accommodate for the increased fighting ability.)
Another group would be "The Dragon Legion", basically elves who sought out the Drath and Dragons after the Cataclysm. These are more "pure" in nature than The Spider Cult, you might think of them as "high elves".
The Legion uses "Drath Guardian", elves who lived with and have trained side by side with the Drath. They don't have special strength like Cultist units, so they have to depend on powerful magical equipment (mounted, powerful lance and heavy armor - this one is for you Heavenfall ). To train these, you would naturally need somekind of fancy barracks on top of a Drath Village.
Then the last one, the "Forest Dragon" could just be a dragon that the Legion has asked for help.
You can also use this to explain all the "gold" cost to train these units. Thoughts?