I really want to upgrade my iPod Nano 1g. So I racked up $400 and I am gonna go ahead and get the 16gb iPod Touch 2g. Is that a good choice or will I regret it come a iPod Touch 3g (generation)? Should I wait? Also, what can I expect from a new iPod Touch in fall?