Just to confirm, did you select Not right now for "Get updates, drivers, and optional features" at step 10 option 2 when trying to do the repair install?
I'm trying that now. I hope it will actually fix things. It is, after all, not the official installer from Microsoft, because Microsoft...