wait for the 3g version - 2g is very slow and wastes the unlimited data bundle offered as part of the package - you will get so frustrated trying to access internet over 2g that you wont bother. Maybe the new phone will also have a better camera as the current 2meg one is rubbish!
I am not sure when the new handset launches though - o2 are being very secretive about it...