Yes 7900xt, I did the exact same upgrade 3070 to 7900xt.
The 3070 would be a decent card except the VRAM, and if playing at 1440p it's no good. I'd be playing Fallout 76 at 144fps, then notice huge frame drops, and sure enough video memory use 100%.
I upgraded mainly because of Lamefield all though what a let down that was, but definitely comes into its own on Cities Skylines 2 which eats as much resources as you can throw at it.
If the 3070 has 16 or even maybe 12 GB memory I might not have upgraded.
Anyway, I am really pleased with the 7900xt and it'll last a long time, I've had mine nearly a year, and I can see myself still having this in 4 maybe 5 years.
Currently playing Minecraft on it