Cap should have been allowed to slip quietly and honorably into history. His shield, uniform and such, entrusted to the Smithsonian with the rest.
Frankly, I think it's a disgrace the way they wrote it, that he had to pass his shield and the "Captain America" mantle on to another, whether it was Falcon or Bucky or anyone else. Yes, there's money to be made by keeping "Cap" alive. Well fuck that noise, it just shows a complete disregard for what attracts people (fans like me) to these characters in the first place.
It's the man, the individual, the human being, that became the hero and created the legend. You can't pass that on. That should be true in the movies, just as it is in real life.