Precisely, the longer the wait, the greater chance of a different shape, instead of staying with the iPhone 4 look. In addition the extra time may allow Apple to get the major bugs out, before delivering the phone.
It would be very pleasant news to have a properly working iPhone right out of the box. The Apple return center would celebrate, that's for sure.