Like with the Princes of Dol Amroth, Tolkien left two versions. I personally now favour the version of Celebrimbor making a second Elessar.
The question of Gandalf turning up in the Second Age would raise all sorts of problems. At that point Sauron had not yet grown so powerful that the West could not defeat him unassisted.
|