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