@jonte
What HWID is showing for your S2? Look in its GarminDevice.xml (located in the Garmin folder of the device, it should be visible in Windows File Explorer via Mass Storage Mode).

It shouldn't be identifying as a Vivoactive HR unless it's had inappropriate firmware flashed to it which has changed its HWID. The HR certainly has Golf functions however it's a much more broadly versatile watch than the golf-specific Approach S2.

Your problem seems unusual because even if GarminExpress is somehow reading the wrong HWID and mis-identifying the device it should still update/replace the entitled detail mapping based on its UID (Unit Identification) number - that's regardless of a changed HWID. The fixed UID and its present HWID should also be available on the device itself, look for "About" page via settings.

I've not got access to either device presently however i don't recall them having a media card slot for extended memory.