I felt the Cap jokes were pretty much Brian Michael Bendis' writing taken right out of the comics. There were multiple occasions in the comics where Cap would say something old fashioned and Spidey would poke fun of it annoyingly, and the whole team would keep bringing it up and won't let it go, it's classic Bendis banters. But then not all comicbook readers liked Bendis' banters in the first place so I guess it could annoy some people, personally I think it brings out each person's character.
The thing is, when the jokes become self aware it stops viewers from making those same jokes, and Cap is the biggest victim since his first movie, IMO it's a good move for them to make his character more self aware because those jokes are coming his way no matter how they write him, it's better that the jokes are part of the story rather then coming from the audience during serious scenes. Cap thinks and talks like an old grandpa from WWII with a body of a 20 year old, I really hope they never take that away from his character, he is not that generic superhero that a lot of people think he is.
As for Tony Stark, if they are going down the Civil War road, he was always going to become less likeable, actually it would really bother me if Tony Stark is still a likeable character in Civil War, that wont be accurate to the comics, it's a character transition that's happening very slowly ever since the beginning. I like the fact that he does fall from grace, that's the Tony we'll see in the Civil War arch, in the Infinity arch we'll see the more heroic Tony come back again. I'd say if you liked Tony Stark in phase 1 and hate him in phase 3 then the movie makers did their job correctly.
I felt Avengers 1 was more of a straight forward good vs evil type story, where as Avengers 2 had more grey areas, where the heroes are the ones at fault for doing the wrong things for the right reason (Tony, Bruce, Wanda, even Ultron). I guess Avengers 1 was more silver age and Avengers 2 was more modern age.
and like everyone else, I also liked Avengers 2 a whole lot more after the first viewing, something about getting pass that first critical/ judgmental mentality and getting to really know the movie after having already seen it once.
---
.
