AT&T 3G Updates?

Hi,

So, I'm currently drooling over the awesomeness that is the Nexus One and am seriously considering upgrading from my old iPhone (1st gen, 8G), but I'm currently on a family plan with AT&T so it makes more sense for me to stick with them. However, I know the Nexus One has issues carrying AT&T's 3G network. I also read somewhere that Google is looking to fix this issue. Do you all know if this update would be issued OTA or would one actually need to have a physically-upgraded Nexus One? If the latter, I'll probably wait until they release the Nexus One with this capability? (Or maybe they would accept people sending in their phones for them to be upgraded?)

Thank you!