Alternatively what would be the best component to replace/upgrade to make the current setup much faster?
That would have to be the processor, which you naturally can't replace without getting a new motherboard. It would effectively boost performance by a factor of 2.5. Generally, though, I would not overthink it. Just get the components you can afford within your budget. The difference between a "normal" core7i and it's Extreme version is minimal in terms of performance, but large in terms of extra cost. Better to invest that money in another or a bigger SSD and a bit more RAM.
Mylenium