the ipod touch will do what you want, but do bear in mind the need for wi-fi access while out and about. i found unsecured networks quite hard to locate when i just had the Touch, now i have an iphone, most of that problem is gone. not allowed to download anything over 10MB via 3G though.
don't forget both of these devices are probably the best personal music players available, storage capacity aside.