Since you can't isolate if it's a software or hardware issue. I would recommend starting fresh. Wouldn't want to copy the issue to the new computer. Just take a screenshot of the desktop and rearrange it if it's that big of an issue.