I still say they should do this story idea: A sort of love triangle that reflects his inner turmoil about where his life is heading, the two paths he can take. And then add the stuff about the Winter Soldier on top of all that. So, maybe, he sets himself up a new life outside of being Cap where he meets Bernie, but then the Winter Soldier stuff brings him and Agent Carter together. The turmoil also can be effected, one way or the other, by Bucky and the Winter Soldier. Maybe it makes him feel he should retire from being Cap, maybe it makes him feel he cannot ever retire. Maybe if Bucky becomes good again it opens the door for him to retire being Cap, pass it on like in the comics.