MSI Wind Gets Delayed, Battery Downgraded

How many of you were expecting the MSI Wind to hit the market already? And from what we learned at Computex this year the Wind should have already arrived. Well it didn't! Not yet! The release date has been postponed to June 27th. What's one more week of waiting anyway?

Why did they cancel and postponed this event? Apparently they ran out of batteries out there and all six-cell batteries will be downgraded to three-cell batteries. The price will drop accordingly to just $479. That doesn't sound that good. After all I wanted the Wind to be really portable and useful. Battery life just went down from 6 hours to Eee battery time (approximately 3 hours). How portable and useful is that?

I was actually surprised to see the Wind run into problems. I kinda started liking it over any of the Eees.
I'd like to know if future battery upgrades for the Wind are to be expected. In other words, should I buy an MSI Wind now (read June 27th) or wait for a better version to be released?