God, I'm not cut out to be a genealogist...

[the guy who be short]

First of all, welcome, and you've done a wonderful job!

With Celeborn being Sindar and Galadriel Noldor, how exactly did the two of them end up Lord and Lady of Lothlórien? Is that even allowed? I can't remember if there was anything on this in The Silmarillion. I kept confusing myself and thinking there's some connection between the Lórien Elves and Celeborn's relations because of similarities in the names: the Lórien Elves are also called the Galadhrim, and Celeborn married Galadriel, with Galadhon as father, Galathil as brother. Only then there's also Gil-galad. Now I see this is just an Elvish naming streak. :P Thanks for clearing that up.

The Lorien elves are called the Galadhrim, Galadh is Sindarin for Tree I believe, to they are the People of the Trees. However, Galadriel uses the stem Galad, meaning light in Quenya; I cannot remember but I think her name means Maiden of Light or some such thing. Gil-Galad again comes from Galad, Quenya for light, the name means Star-light. The similarity comes from the words Galadh and Galad in the two Elven languages being so similar. Hope this helps.

I also thought Ereinion Gil-Galad was the son of Fingon.

TGWBS

EDIT: I've just checked my copy of the Silm, Gil-galad is the son of Fingon in the latest version.
EDIT II: A minor note: Maiar and Vanyar are plurals (as are most Quenya words ending in "r"), the singular should be Maia and Vanya in lotr-a.bmp.
Again, congratulations on tackling so great a task.