If he did talk to Elrond about it, maybe he'd have some ideas? (And Gimli can make him tiny perfect purple-lensed spectacles~~ ♥)

Glorfindel, maybe? I love Glorfindel a lot, but I know you've only written him once. If not him, Aziraphale? I got asked Crowley, so they're in my head now. ^.^