It seems that the "stream any song instantly" usecase is winning out, but I really pine for some metadata / playlist overlay that I could use to regain this sort of control of my music streaming.
I was a Winamp guy on Windows, now I'm using Swinsian on Mac and both GoneMad and PlayerPro on Android.
I replaced my usage of spotify with these two and its been great. I also enjoy having fine grained control over my listening, and streaming services were sorely lacking.
Possibly ironically, both of those examples work on current versions of the Music app on macOS, and will work with both local and cloud files in your library. There are many valid reasons to dump on The Application Formerly Known As iTunes, but it remains more capable at library management than I think it's usually given credit for.
(N.B.: the same cannot be said for its iOS counterpart, which can sync smart playlists but not create them, and seems to have dropped support for star ratings completely.)