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.
Emby does as well. That said once you live without discover features and unshackle yourself from algorithms I will say ... It's really not that big a deal lol
I used to go hard finding new shit on Spotify and YouTube etc, but eventually word of mouth with friends and the library really solved the issue. Also changed how I consume music from songs in a playlist to looking at every album as one solid work of art to be understood.
Now I hit up my friends when I want new music recs, they hit me up. It's a good ice breaker. The library is also mad under used as a resource, they love supplying new shit if people are wanting it.
I got to a point where I am now where I carry around an iPod, and some CDs for the car lol may be weird however works for me and I paid zero dollars for music the last couple months cause now I have a solid personal library.