I don’t think we’ll see old man Steve, so while it’s probably right I don’t think we’ll get a reference to this scene. I also think when Steve goes back in time to live his life he already knows he’s giving the shield to Sam. I expect instead during the film Sam will see Steve without the shield, try and give it back to him, and Steve will refuse since he already gave it to Sam. (I do still think Steve will don the shield at some point, but he’ll return it to Sam as soon as he can.)