I recommend the touch; however, I'd suggest waiting until after June to purchase it unless you can get it cheap somewhere, so you don't have to pay for the software updates and you already have an iPod that should be sufficient until then.
The midyear update cant come quick enough, I want to play games on this stupid thing!