Krazy, to be honest if I was you I'd stick with the iPhone considering what you have just said and it sounds like you are happy with the iPhone. The iPhone 4 is a lot better than the 3GS so you will be very happy with it. Not sure about HTC, but the Samsung software is rubbish. For music and media, I can mount my phone like a USB drive and just copy things onto it or copy things over wifi directly to the phone via one of the many file explorer apps on the Android market.