So I was having the same issue and solved it by doing an in-place upgrade with a USB drive created using the MediaCreationTool2004
I had been reluctant to go that route because I was afraid to lose my data like with a reset, but in the end I gave it a shot and -hooray- this solved the issue for me. Took quite a while until everything was finished, also because of subsequently available updates, which had to be installed after the "big" update was done, but now my system is up to date. No more errors, and all my files and settings are still there.