If you have the Radeon VII keep it and if you have the 5700XT keep it. newls1 has experience with both.
I purchased a Radeon VII when it was first released but later would have purchased a 5700XT had it been appreciably faster.
I wanted an all AMD high end rig so I went 3900x/RadVII.
From what I read, Big Navi probably won't drop till late in the year.
I do not put much stock in the upgrade advisor.
9900k-5.0-Krak X72|Asrck Z390 Taichi|32g-DDR4-3200 FlrX|EVGA GTX 2080TI XC | Crsr MP500-480g+ 2-1tb ssds|EVGA 1000W|Thmtake V51|Acer ET430k|Win10-64 home + Oculus Rift
3900x stock Custom WC Optimus WB; 480+360 rads EK D5|MSI X570 Unify|32g-DDR4-3600 TriZ Neo|Asrck Rad VII-EK blk |Sbrent Rocket 1tb NVME4|Crsr RX850|Fractal Design 7XL|BenQ EX3501R