My girlfriend is getting me a touch for my birthday in about a month. I have been looking around and I have narrowed my choices to either the 32gb 1st gen or the 16gb 2nd gen. My library of music is about 18gb, but surely I don't need all of it on my touch at once. I'm more worried about space for movies and the speed increase of loading apps/browsing with wifi. Is there a really significant upgrade in these categories to warrant the loss of space for movies and the rest of my mp3s? The speaker doesn't concern me much(although I can see its use for youtube/internet/apps), nor does the form changes. As for uses, I would mainly use it at work as a regular MP3 player, using around the house with the wifi, and occasional use at college between classes.