Upgrade from 5th Gen iPod to iPhone 4 or Samsung Galaxy S/Vibrant?

Hi,

WIll upgrading my 5th gen iPod to the iPhone 4 orr Samsung Vibrant yield a nice upgrade in SQ?

OR maybe forget the phone + music player convergence and just get a Sansa Clip and keep my old blackberry in my pocket?

OR am I better off upgrading the Ety ER4P that I use with my iPod to one of the newer IEMs in the market. It used to be just Shure and Etys a few years ago and when i got back to Headfi a couple of months ago, there are suddenly a ton of options.