Hi, I'm looking to upgrade my pc.

My current one has these specs:
GPU: "GeForce GTX 1660 VR Ready 6GB GDDR5"
CPU: "Intel i5 9400F "
RAM: "Corsair Vengeance LPX 16GB DDR4 2x8GB 2666mHz"
Motherboard: "GIGABYTE B365 HD3"
PSU: Corsair VS550

I mainly play Minecraft at pretty high settings and run shaders, I also play GTA V and edit videos here and there.

I want to upgrade it so it can handle GTA 6 when it comes out, and just run other games (and overall performance) better because it's been getting pretty slow...

I think I would need atleast 2tb of storage and 32gb of memory. Not sure about the CPU and GPU tho as I haven't been keeping up with that. I only know a little about NVIDIA GPU's, but am willing to maybe get an AMD one if they are any good.

Thanks in advance!