No, it is not Thorondor, but now that you have the lovers, Beren and Luthien, and the kinsmen, Maedhros and Fingon, you only need to find the friends, who are not Húrin and Huor or I would have written '
brother to brother'.
The "I" should be made clear then, I think.
EDIT: the last two verses have been deliberately phrased so as to be puzzling, because I was afraid the riddle would be too easy.