You might want to check this thread out, especially since it has a very complete although not perfect tree of the Eldar and Edain genealogy.
Eldar
Look at post 32.
Some things that come to my mind after seeing your trees are the following:
Why do you have Erenion as the son of Fingon?
You should read the
Shibboleth of Fëanor to have a fresher perspective.
Orodreth shold be the son of Angrod and Eldalótë, and Erenion should be the son of Orodreth and brother to Finduilas.
You might also want to inlcude Arakáno, who is the younger brother of Fingon and Turgon. And have Anairë as the wife of Ñolofinwë.