The 2.2 update gave the Dalvik the JIT, which in some codes supposedly give 400% boost in performance.
The iPhone 4 is to be released next month in my country, so I´m waiting to see if I go with it or with a high end android to replace my old symbian.