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.