Hey Mike, I have a solution for you. Go for Faronics Deep Freeze. A kernel level reboot to restore software. Just a restart will solve your all problems every time. I'm facing same issue with Windows restore utility, after spending too much time failed to restore my system. So finally I have reinstalled XP and added Deep Freeze. It helping me a lot. Hope it will help you too.
OnePlus 5T review: Hands-on