Oy, 30 second 512x512 video generation is taking like 15 minutes each and maybe you lads can gimme your opinion on a hardware upgrade?

RTX 2060 Super 8GB
Z370P D3
32GB Ram
Intel i5-9600K (6 Cores) (OC to 4.7GHz)

I am thinking switching to a Ryzen 9 like 5950X should be a good idea, or? Or is the GPU a bottleneck as well? What specs do you guys have?