I do like a challenge, but so far I have not found any way to fix this issue with .NET. The commands meant to restore it do not work.
I even did a Windows Reset, but the results were no better than your in-place upgrade. .NET still looks the same, with several items misplaced in the list of available Windows Features. Even MMC cannot load the Event viewer now.
This was all on a Hyper-V VM, so I can restore that easily, but I will try to send in a Feedback Hub Capture of the issues before I am done with it.
That leaves a clean install as the only way forward that I can suggest. My system is setup with all data on separate disks, so a clean install for me has very minimal impact. I totally remove all partitions from my NVMe SSD during a clean install. I do not have many Apps, so it does not take long to be back to normal, and usually with several things improved, after a clean install.