Yeah definitely do a full OS rebuild before throwing money at hardware. If you have a bad build it'll cause issues. MS will swear up and down that their OS is rock solid, but it's not. I used to re-build mine every 12 months, but I will admit, my current Windows 10 build has lasted over 24...