As somebody already said SSD's are way to go, I would even completely erase that HDD and use SSD only with NVM'e drives and that's it completely. But I would wait for Ryzen 3000 anyway and will go...