Yeah I mean it was pretty obvious that sparing Tony was with intent from the dialogue like "We're in the endgame now", and "This is the only way". Strange said earlier in the movie that he would save the Stone over Parker or Stark.

It will be Avengers: Endgame IMO because it works on two levels. One, they will obviously defeat Thanos and travel through time (there are lots of set pics of A4 with them in the A1 gear), and B) it will be the end of feature films for Stark and Cap. I would bet my shirt Cap dies saving Stark, and Bucky becomes the new Cap.