If the retcon Roxy is dead, does that mean the 'original' Roxy will pop back into the timeline (assuming she used the voidy powers to preserve herself)?

She’s coming to the retconned timeline with John.  That’s where they’re (supposedly) teleporting in the last upd8.