So, my upgrade date is on January 6th, and I was thinking originally about getting a Blackberry Bold 9700. I then decided against it because it didn't fit my lifestyle, and the iPhone 3G have now does. However, the fact that the iPhone 3G has such limited RAM makes me want to upgrade to a 32GB 3GS. However, the rumors of a multicore, 5 MP camera iPhone 4G makes me want to wait. Considering the time now, do I go for the 3GS and hope that firmware 4.0 brings functionality or do I just wait for the iPhone 4G all together?