Well I don't think we'll ever really know who Aragorn is thinking about. But everytime I see the scene where Aragorn raises his cup, I personally always think of Haldir, especially because he should have never died in the first place.
Well, yes, the pictures in Rivendell should look familiar because they are by Alan Lee. He actually just won an Oscar for Best Art Direction because of his involvement with the films. And they were also featured in Fellowship