I am still using an iPhone 3G, but plan to upgrade to the iPhone 4 on launch day. I currently use only about 1GB of space on my iPhone 3G (8 GB). That said, I don't have HD video on my 3G...or a 5mp camera (and I take a decent amount of photos with my phone...and I can expect I'll take even more since the camera is much improved on the iP4). For the average user that is a little "snap happy" with photos and plans to take HD video clips here and there...do you guys think 16GB will be enough? I probably will store very little music on there...since I use my iPod Nano for all of my music. Thoughts?