I say the Zune. First off the ipod's touch screen is an overrated gimmick. When you're watching a video, do you really want to see your fingerprints all over the place (or have to clean the screen everytime you want to watch something)? Zune's got WiFi and radio (take that Apple), and the second-gen Zune is pretty much on par with the normal ipod now.
If you want more stuff on either one, you can always download Linux for it.
If you want more stuff on either one, you can always download Linux for it.