I would move to Spotify because of this same reason but I've never fully been able to understand what they do with your own music that you bring to the library.
I have some live recordings for example, how do I get them in my library so that they are available on Computer #1, Mobile Device, and Computer #2 always and forever (a la iTunes Match and now Apple Music).