Ryzen 7 and 1070ti build upgrade

I currently have a PC running a ryzen 7 3700x and a GTX 1070ti with 32 Gb RAM. At first glance maybe changing the grafics card would be the best option as the card is becoming quite old. A change in the CPU could also be due in the next few years and that involves changing the motherboard. That change would be good as I could future proof with the new sockets. If I change the GPU, I dont mind switching to AMD but, at least from my knoledge, they have resulted in more compatability issues with gaming.