Galadriel55– another very clever answer. But as you point out yourself, the first line would be a stretch. The answer to this riddle betrayed a certain, specific lord, and played a more immediate role in "defeating shadow".
I did wonder if someone would guess Fëanor, though.
And again, you're also taking the right approach (in a different way).