Glorfindel and Erestor?
Okie, I know it's just wishful thinking, but perhaps these two are actually Glorfindel and Erestor? I mean it WOULD make sense if Elrond's two cheifs stayed at Rivendell with him until he left to the Grey Havens but just two elven swordsmiths?!? All elves were supposed to go to the Grey Havens were they not?
Again...wishful thinking