Yeah, I would personally replace i9 with i7 (similar frequency, overclockable or not) and use money saved this way on better GPU, like 2070 Super (or next-gen 3xxx RTX), if I had a limited budget.
And the guys are right, 32GB would be very helpful, the same as an additional HDD.