The real question is what makes you need a new system right now?
Personally speaking as of this moment, I would not make the switch till Alderlake. Then decide on which path you wish to take. Both Z590 and X570 platforms have their own pitfalls and trade blows depending on the workload.
13900KS / 8000 CAS36 / ROG APEX Z790 / ROG TUF RTX 4090