Tidal music streaming app is now available on the galaxy watch and seems not to suffer from the same issues that the useless Spotify watch app has.
It does have some quirks like the widget doesn't seem to sustain itself very well but other than that it seems to offer very much the same functionality for similar pricing
I haven't established the catalogue of songs but seems comprehensive
Suggest you try that and see if it is a better experience
Recommend that you move to that from Spotify which is not going to be updated on galaxy watch