Replying to confirm I was able to resolve this for my PC. This might help someone else.
At some point I had tried AMD StoreMI on my PC and removed it. But it had replaced my "Standard AHCI SATA controller" with a different driver called "AMD virtualized AHCI controller for StoreMI". As soon as I replaced it with the standard AHCI controller driver, the correct unique IDs started showing for all my SATA drives.