I have an upgrade coming up in the middle of august. I hope supplies are plentiful by that time.
I'm 95% positive you DON'T HAVE TO WAIT. Didn't AT&T just change their policy so anyone with a contract expiring or upgrade coming in July or August can upgrade early? I'm sure I read that a week ago or so..