That's the best way to resolve your issues. However, note that 1909 has a file explorer search bug, widely reported, introduced by MS changes to search.

Now you have a working PC, start using disk imaging routinely so you have a way back should things go wrong. Plus protection against fire/theft/flood/viruses if your disk images are kept off line. Macrium reflect (free) is good- paid is better.