My suggestion would be similar, or to max out speed you can use 2 SSDs in RAID 0.
And while you are at it, you can add another 16 GB stick, which should help since these qre memory intensive programs. The CPU is good enough to handle the load.
Replacing HDD with SSD will provide good boost, and...