Mine started misbehaving again, so took the nuclear option.
Restored back to factory Windows 8, installed the shortcut update to enable the 8.1 update then waited and waited and waited some more for GWX to download Windows 10.
Took a while, but all seems to work correctly now.