You might as well sell the 7800X3D and upgrade once the 8800X3D / whatever it's called comes out.
Now that you've you are going with an AM5 system.
Looks like the biggest changes with Zen 5 are going to be the R9s - I don't think the mainstream CPUs are going to hugely change the story compared to what you can buy now.