^crashings, freezes.., that's more related to an unstable system rather than the cpu struggling...
Or maybe just a new SSD or two? 😛
But if you want to upgrade, July 7th is just as good as now, I guess.
If you wanna wait, then the Ry3K series may disrupt things enough for either Intel to drop prices or just get an amazing upgrade/deal with AMD.
Cheers!