Due an upgrade next month and I'm wondering whether to hold out (paying a bit less until it's out) or pay the same as now & get an iPhone 4. I currently have a 3GS