I have a PowerSpec G351 PC from Microcenter that I bought about 3 years ago. I'm looking to upgrade some parts, namely the GPU, CPU, and the motherboard. I use this machine primarily for gaming and want to keep it up to date and future proof for the next few years. Specs as follows:

CPU: Intel® Core™ i7-8700K Processor

GPU: NVIDIA GeForce® GTX 1070Ti PCI Express

Motherboard: ASUS PRIME Z370 P System Board

Memory: 16GB DDR4/3000 DIMMS

PSU: Masterwatt 600 80 Plus Bronze

Storage: 1x 480 GB NVME (2 sticks), 1x 1 TB SSD, 1x 1TB HD

I'm somewhat torn over the GPU, as I want to keep this affordable, hopefully below 1k, and am wondering if I should get an rtx 20 series card or wait for a reasonably priced 30 series, or if I should try out AMD. I don't really care much for rtx by itself I'm mainly looking for the performance boost while playing on high/ultra settings for most games at 1080p, at least 60 fps. I know the rtx 20 cards got a bad rap for their lackluster performance boost in comparison to the 10 series and rtx being something of a gimmick at the time, but has that opinion changed since then?