iPhone with partial dead touch screen, possible 3G replacement?

I went to the apple store about 2 weeks ago as the top half of my iPhone touch screen no longer responds to touch. They said they will give me a free replacement as I am under my 1 year warranty still (October purchase date) but I said I would like to return and sync my contacts before doing that (read: partially true, but I also knew the 3G was coming out soon). So now I am wondering, as they have no refurb models for sale anywhere, and are no longer stocking the iPhone 8Gb first gen, do you think its likely/possible that say I go back in July 11th I may get a 3G....Otherwise I'll just take the first gen replacement (if they have any)and sell it when the new ones arrive

Anyone else in my shoes wondering what to do?

 

baaahhh why must you burst my naive, self-deceiving, optimism bubble?