(1) I can think the flip-flop of your two (I guess)
NVMe devices is attributable to going from the oldest to the latest BIOS version. There must have been many tweaks between the two not described fully in the little blurbs. I wouldn't worry unless it happens again & for no apparent reason.
I have a hunch Disk 4 may be the better of the two M2 slots you've got. I'm thinking it might be the lower of these, & that the top one might not be "x 4"...
1
x M.2 Socket 3, with M key, type 2242/2260/2280 storage devices support (both SATA & PCIE mode)*^2^
1
x M.2 Socket 3, with M key, type 2242/2260/2280/22110 storage devices support (PCIE 3.0 x 4 mode)
Now that Windows Update is working again,
I would go back to the site & take all the drivers that have a greater version than shows up in Device Manager. Maybe click for them first in Device Manager (search automatically). Sometimes that will get one of even a greater version
- but the dates at your site are impressive.
(2) Startup Repair says it "couldn't repair" even when there was nothing to repair in the first place. Here is a picture stolen from Shawn Brink...
https://www.tenforums.com/tutorials/27649-run-startup-repair-windows-10-a.html
Run Startup Repair Windows 10

Go to "C:\Windows\System32\Logfiles\Srt\SrtTrail.txt" in File Explorer to see what is in there. Or ask Cortana for "SrtTrail.txt". Does it say anything even more suspicious inside?
(3) I'm puzzled that "FAT 32" has dropped off your EFI. Have you rebooted to see whether it returns? Maybe the shock of that flip-flop confused it on the first boot. We could put a letter on it & see whether SFC will straighten it out. Also we must decide
whether to leave well-enough alone or to move that EFI to its fit & proper place in front of the MSR. Likely it loses its identity again, but we know we can fix that.
(4) Well, let us see your "BCDEdit" now. Yours should show "HardDiskVolume3" where mine shows "...1".

(5)
(a) Do you have a WinRE.wim file at "C:\Windows\System32\Recovery"?
That is an alternate location for the recovery environment.
(b) Whether it is there or not, what is the result of...
Open an Administrator Command Prompt, & enter "ReagentC /Enable"?
If it reports success, what is the output of "ReagentC /Info" now?