I REALLY hope that they go with something other than death, whichever choice that is. If anything I hope that's fallout linked to the fate of Bucky and for myself it would be best if Bucky dies and thus Cap, seeing it or even being forced to kill Bucky himself (due to James having a head of bad wiring due to the brainwashing and suspended animation ) Cap then is broken, crushed spiritually, and he goes to jail or simply walks away. Both take Cap off the table without having to get involved with death fake outs or using the Infinity Gauntlet to change his death or the like.