Legolas vs. Aragorn

I have to say I don't really agree that Legolas is overshadowing Aragorn....I think the movies still make it pretty clear that Aragorn is "the guy" and Legolas, along with Gimli and to a certain extent, Gandalf are helping him to reach his appointed place. The thing is however, Legolas' special skills are portrayed awesomely. The keen eyesight and the bowmanship and stuff. I have to say Legolas is the MVP of the fellowship (I especially like the part where he's firing on the wargs and does that crazy thing to hop up on his horse) but I feel Aragorn is given his due for sure.....I don't really like how Gimli is used for laughs though....it seems between the two movies his character has instantaneously changed. At the end of fellowship he's still pretty much a cranky cantankerous dwarf but almost from the get-go of TTT he's comic relief.....blah.....still UBER pumped for ROTK though