So I ordered an Incredible on Tue 6/8 (right after the iPhone 4 keynote: I wasn't impressed). They estimated my delivery as Tue 6/29. I called about a week ago and it was still estimated as 6/29. So with this whole Samsung screen issue, will I be getting the Samsung screen or will I be getting the second rate one? Thanks!