It would help if you had a budget.
If i was on a 1.5 Lakh budget.. i would get a 4k high refresh monitor + 4080 super + 32GB RAM and keep everything else.. because at 4k the cpu bottleneck is more or less removed.
I've seen charts where 12th gen i5's and 7800x3d performed about the same at...