I am having exactly the same issues (you could have copied and pasted my post about it) - with the exception that I had a HDD, not an SSD. And I’ve hesitated to buy one at this time for the very reason you are posting - because I cant be sure that getting an SSD will fix it.