Instead of factory reset, have you just simply tried a clean install of the latest Windows 10?