[Gwydion]

The best warrior obviously had to be smart and cunning so I'd say it would have to be Gil-Galad, Aragorn, Eowyn and Elindil. Eowyn may not seem that good, but she did kill the Witch-King with a broken arm and not that many people could have done that. Gil-Galad and Elindil killed Sauron while he was wearing the Ring and Aragorn was just smart, quick and strong like all the others.

Boromir was a good commander in Gondor, and he was wise and his sense of duty was strong. I mean look what he did just to try and keep Merry and Pippin safe, most people would turn around and run faced with the odds that were presented at Amon Hen.

So in the original list it's a toss up between Aragorn, Boromir, Faramir, Legolas, and Gimli. Really the possibilities are endless and it depends on your opinion. In reality they all were the best in their particular areas.