I actually decided to purchase Zune again and I will be using it as my primary mp3, for now.
I don't really listen to music (or media in general) on my devices, but my new job is in the city and the commute, although not long, can be a bit boring if no one is away to sms with.
i'm using my iPhone 4 headsets. works well, but may invest in the beats by dre and see how that works out.