Recommendations on upgrade

Hi guys, I've been working on my pre built alot recently. I've changed the case, swapped the aio for a pa120, upgraded the fans ,increased from 16gb to 32gb ram and removed all the RGB. However I'm not happy with the performance anymore, it's got an i7 11700 (locked version) on a gigabyte b560m V2 mobo (recently found out know issues with vram overheating) and a 2060 super which while it can run on high in most games its having to get hot in doing so 😂

So I'm thinking of updating the mobo, CPU ,GPU and consequently the ram as most new mobos no longer support ddr4 . I'm open to switching to AMD I don't have brand loyalty and it looks like intel dropped the ball in the last two generations, aslong as it's reliable and suitable for both gaming and lightroom/Photoshop as I do some editing. I know people will say wait out till the new gen is released but I've got my other hobbies which require more money so I don't mind getting something that's maybe currently the better spec but will be out of date by the end of the year. Thanks