[Gwathagor]

I don't find Gildor problematic, personally, since the elves as a whole play a minor role in the War of the Ring and even, more specifically, in the story (LotR) itself. Legolas accomplishes the least of all the members of the Company. Elven-folk as a whole, with their power and significance fading, are relegated to the role of counselor-along-the-way, rather than warrior and day-saver.