Would you switch to the new iPhone this year

The new iphoneOS4 or 4G what ever the name will be has already been leaked and looks less curvy but interesting nonetheless.

Having owned the original iphone (non 3G) version I was quite happy with it. At least for the first couple of months and before I found out it's limitations such as limited bluetooth profile, no flash, no multi tasking and one that bothered me a lot was the low ringer volume.  Some of these issues were resolved in the the 3G and 3GS versions but the lack of multi-tasking and flash support still kept me away and I enjoyed my Samsung i7500 as a replacement smart phone in the meantime.   Now that Samsung has let us down with no release in sight for a new Rom 2.x updates I am having a second look and evaluating my options for either iPhone OS4 or the new 1Ghz Android devices.