Windows 10 ISO did the trick. I'm amazed at how quick and painless the upgrade was. Didn't have to do anything except update my graphics drivers, everything else was in it's place.