Tony needs to die a permanent death. Not because I don’t want more RDJ/Stark in the MCU, mind you - because it’s the only proper ending for his character arc throughout the MCU.
Cap should die, too, probably. And that’s just because it’s fitting that he’d sacrifice himself, not because it needs to happen the way Tony’s death does.