I agree that Sam going back to "just Falcon" is not a demotion. He had a truly unique identity for years, and it's not as if he even really wanted the "Captain America" title in the first place, did he?
Had he spent years and years training with Cap in hopes of being "the next Captain America"?