Take my advice and don't upgrade just yet, as i have a iPhone 3g and upgraded and have now got a very unresponsive phone and Apple aren't doing a thing about it, this has happened to thousands and it may happen to your
iPod touch as well, so make enquiries about it before you do. When i upgraded all my things were still on it, but sync it to back up on your PC just in case.