Falling Icicle
Adventurer
I liked how 4e had 3 types of elves: the civilized elves, the wood elves and the drow. I just hated the name Eladrin. High Elf is much better, IMO. I would keep those 3 basic types. Any other subtype could just be a cultural difference without being their own subrace.