Yes it was Feanor [The Shibboleth of Feanor] who was refused by Galadriel... concerning the Nerwenian hair matter.
Another possibility is that Olórin took ship to Edhellond in the Second Age. Not that I necessarily would choose version A over B, but again this merely allows a way to step around the question of Nenya in the Third Age.
Granted A notes that the 'years' of her exile were wearing heavy on Galadriel, but I think there is still plenty of years in the Second Age for this, before Numenor fell. Another thing that threw me a bit before was the brief statement that Olórin had arrived with the Elessar out of the West, as if referencing only one trip; but that too seems vague enough to me.
And yes I think Celebrimbor the Feanorean was a later idea than the text of the Elessar, which is why I plug Enerdhil back in as the Elf from Gondolin without Celebrimbor. Again we are dealing with a still private [to Tolkien] text, not necessarily updated after Celebrimbor's change to a Feanorean [although there was some revision regarding Galadriel's ban, for example].
With respect to the first version of the two competing Elessar tales, Hammond and Scull (Reader's Guide) also note that, in comparison to what was already published:
'... the tale seems to suggest that there was a breach of trust, in that Galadriel did not keep the Elessar for the one destined to receive it'...
... because in
The Lord of the Rings Galadriel said that she had given the stone to her daughter. In the second version Tolkien explicitly refers to Galadriel giving the stone to her daughter, so it doesn't seem like he had forgotten this. I suppose Galadriel still could be said to have
'handed it on when the time came' as technically the jewel had come to her once again to give to Aragorn (if we look at Gandalf's statement more as a prediction), though even so, she handed it on before Elessar came to receive it.
I noted this in the thread:
http://forum.barrowdowns.com/showthread.php?t=15599