Just to update, I finally gave up and did a clean install of Win 10. That solved it.