IPod touch or nano 4g?

I have a 2g nano right now, and its time to upgrade. My estimate of songs i would have at the most is 1,000. and not many videos, just a movie or two, or a tv show. my problem is, if i got the touch, i could only get an 8gb, and I dont know how much apps take up. I would want aim and a few games. but I dont know if that would take up too much from the 8gb, which would leave me with not enough room for music and video, presumably. but if I got the nano, i could probably get the 16gb one, but then i would lose the features of internet and aim. and i like the jailbreaking feature of the touch. shhh. i wouldnt be buying games for my nano. anyway, which one should I get? prices aside.. based on what i said here, what is better for my situation?