Just do a upgrade but not the iPod touch please. I was expecting to be wowed by a 3rd generation iPod Touch. Just like the Second Generation wowed me with a speaker, volume control, hidden blue tooth and new shape. These were a 1G to 2G jump.
Faster processor and increased capacity are standard, expected, par for the course, the natural order of things, obvious, no brainers. What was the wow factor this time? What was the funky new shape? What was the speaker? What was the extra buttons?
Face it - no thought went into the ipod touch and the nano.
Stick with the zune HD, cheaper 16gb than the new ipod touch, hd radio, wifi enabled, OLED screen, friendly interface and most of all a new toy to play with :]