Hi,
So you have performed an in-place-upgrade! And yes this will resolve such issues when a number of RTM keys in the registry and systemfiles are missing. But your latest COMPONENTS hive looks good, and I don't see any possible issues!
If everything is up to date and dism /online /cleanup-image /restorehealth
shows no issues, then this system should be fine again.