Finally made it work:
- Download the latest Windows 10 install file as ISO
- Open the ISO and run Setup.exe
- Complete the installation/upgrade in Windows 10
- Run Windows Update a couple of times
All updates OK. After working on the system for maybe 20 hours. Not happy.
Works on my machine, but probably not the right solution for everyone.