The Dilemma

I have sent my broken nano to apple and am now awaiting the arrival of a brand new one. I am still not sure if I want to upgrade to the 30GB or 60GB iPod. Watching my vidCasts (Command-N and Diggnation) and TV Shows (The Office [UK], Home Movies, Family Guy, South Park, Seinfield, etc) while on the bus or working out is very enticing. I also like the idea of backing up ALL of my music (I have about 15GB) and some video files (that are already backed up on DVD). The battery life for video playback is fairly pitiful though; the 30GB gets about 2-3hrs and the 60GB gets about 3-4hrs. If my PSP doesn't sell on EBay, then I defiantly won't be buying a new iPod, but if it sells, I will have a dilemma on my hands, the kind of dilemma that only a well-off white boy in a first world country faces.