White iPhone 4 in Australia

So, I heard there's a new iPhone 4 model coming out before the end of the year. Apparently they've fixed the antenna problem, so the antenna configuration looks different to that shown in the photo above. The new version of the iPhone 4 will be available in Apple's famous toilet-bowl white.

Should I wait it out for the white iPhone 4? I have otherwise considered buying a Motorola Android phone or waiting for the Windows Phone, but the number of apps I've compulsively bought for my iPhone 3GS makes me feel like I should stick with Apple products, despite how evil Apple has become in recent years.