If I'm 100% honest, I've hated their interactions since the first Avengers movie, and no Avengers movie since has made it any better. Much, much worse, usually. So ... I'd have been fine with them never 'reconciling'? They just never worked well together, at least not in the MCU. I would have been 100% fine with them existing at opposite ends of the plot forever (if, you know, they lived that long). I thought that way back in Avengers 1 when comics-style Stony was huge and the movie just never backed it up, and then AoU and Civil War happened and just ... They're a trash fire. They have been from the start. When they're not in each other's way they're actively bad for each other (hi, Civil War, how are you).

Let Steve hang around with Nat and Sam and Bucky, let Tony hang around with Rhodey and Bruce and Stephen, let them pilot separate teams and work together on big stuff OUTSIDE each other's chain of command, with backup and input from other people. If they want to hate each other on a personal level let them do it. There are ten thousand heroes in the MCU now. They don't have to keep shoving these particular two together.

(No, I don't have strong feelings about this, why do you ask?)