Go for the new iphone and upload all your music to the cloud, £25 a year and you can stream to any of your devices.

As much as I dont like being 'tied' to Apple no other product works as well for me (my lifestyle)