Tidal I believe has what you're looking for and may be worth a shot.
Deezer is non American and I think it's worth a shot to try if you wanna give that a shot as well as the seem the least shitty.
That said, Plex/emby/Jellyfin although lacking discoverability is what I used to transition off Spotify in conjunction with tidal. Eventually found out the local library had CDs and used that to discover new music, started buying CDs I liked and enjoyed and have been very happy since since I don't have a month subscription now as I don't need to rent my music.
(if you're the type to be sailing, you could also copy CDs from the library)
I'd say your best shot is to just experiment around, Spotify is always going to be the most convenient. Deezer (as far as I know) the least shitty, and tidal the best quality.
Tidal I believe has what you're looking for and may be worth a shot.
Deezer is non American and I think it's worth a shot to try if you wanna give that a shot as well as the seem the least shitty.
That said, Plex/emby/Jellyfin although lacking discoverability is what I used to transition off Spotify in conjunction with tidal. Eventually found out the local library had CDs and used that to discover new music, started buying CDs I liked and enjoyed and have been very happy since since I don't have a month subscription now as I don't need to rent my music.
(if you're the type to be sailing, you could also copy CDs from the library)
I'd say your best shot is to just experiment around, Spotify is always going to be the most convenient. Deezer (as far as I know) the least shitty, and tidal the best quality.