New
#61
Yes, you have - no argument there.
My only concern is that the reason your Surface Pro 4 (and no other RTM machine) got the Feature Update to Windows 10, version 2004 is that your SP4 has inadvertently joined the Insider Release Preview Ring. From everything you have said you do not believe that to be the case, nor do you want your SP4 to be anything other than RTM.
If so, then the best course of action would be to switch the 'Stop getting preview builds' to ON in Settings > Update & Security > Windows Insider Programme. It will then rejoin the retail release ring as soon as 2004 gets its public launch, probably in about four weeks.