neither (:
iphone (3g is win)

but between the two, I'd have to choose ipod touch (just because i listen to music more often)