Hardware Upgrade recommendation for AE

Hi, i've been using AE for a while and felt like its time for me to upgrade. It just feels fairly slow using my rig i'm using at the moment, and just want to atleast edit smoothly for my next few projects i have.

My work is in between simple motion edits and effects heavy ones (frag edits), even then my current rig feels slow editing those.

I'm thinking either upgrading to an Intel core i7-13700KF (Planning to change mobo aswell sooner or later) or upgrading my GPU to a 3060ti.

If anyone can help me it'll be greatly appreciated!

My current setup

CPU : AMD Ryzen 7 3700x

GPU : GTX 1660Super 6gb

RAM : 32gb