Honestly, I would for us to get some sort of movie synergy in this aspect. Let Thanos win, and half the universe gets erased. Then use this as an opportunity to adapt the time heist type is story to undo it like the MCU but they fail, but while failing they bring past versions of characters from 616 to the present.
Snag T’Challa from either the end of Priests run or the very beginning of Huldins run, pre-marriage T’Challa. And let him be the ongoing T’Challa, he’d be the real T’Challa after all, but only without the Coates/Ridley and AvX baggage.
Do this with other characters that got ruined too over the years. Peter Parker. Ben Reilly. Others whose stories have got so convoluted or messed up from bad stories. It won’t be a retcon as in erasing old stuff, but at least resetting the status quo to a point where the characters aren’t so broken again.