ccs
41st lv DM
I expect they will do both.
I doubt we will see any "regular" elves, for the same reason we won't see dwarves, halfings or orcs. And that's not for legal reasons, which have long been resolved, but simply because they want to dodge accusations of being a Lord of the Rings rip off (which it will be).
Do you also doubt that the Earth is round?