Lord of the Rings Series -- Amazon

As they're both dead, official canon is set.
Just one item that's egregiously wrong is that Gil-Galad had no right to offer a trip West to anyone. The Valar themselves invited every elf everywhere (except a few whose actions/oaths precluded accepting) to come to Valinor and live there forever.
Lol. Wasn't done in the show, but it would be a way to get rid of troublemakers/rivals--"I grant you passage to Valinor!," set them a sail, and then let them get mauled by the dragon fish.