I’m an AMD fan, but don’t think the 7800 is in a good price:performance ratio position. A 4070 I think is going to be the better option, especially considering Nvidia’s frame generation tech hits a bit harder.
I’d wait for the super though. If you get that, it will last you easily as long as your 1070ti has. Unfortunately I think the price will be more than €600