iPhone 4G – Visual roundup?

Looking at this visual roundup of the presumably iPhone 4G, I have to say, they are catching up. Most of the things are still not certain but it looks promising. I am still an Android-freak and for sure this 4G is not going to make me switch phones (again) but they would be stepping up to the plate and filling the gaps.
For the moment, I will just wait and see what is going to happen and what it will be. Until then, I am more then happy with my Nexus One.