[kingnight]

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).

[prh8]

Google Music allows you to upload your own music, and has a near seamless integration of personal library and streaming. GM at least covers the use case of personal music across all devices, mixed with streaming. Not sure about iTunes Match as I've never used it.

[tuxidomasx]

Co-sign on Google Music. I've started adding all new music I find this way, from albums (one-click torrent download), to singles (youtube/soundcloud-to-mp3 sites).

The Google Music Manager can be set to monitor your download directories and uploads any new music to Google Music automatically (even if they are ZIPed).

The mobile app is pretty slick too: syncs automatically, and has a 'store music locally' option for when you don't have a good connection.

[azeirah]

Spotify does support local files and can even synchronize them across multiple devices. I noticed today that some of my local songs were available on my work laptop.

The process of adding and synchronizing your local music is not the easiest and most intuitive, but it's possible.