You could always wait till your warranty expires, which is what I'm planning to do with my phone. But then you'd have to wait...

Or is there a way to rebrand the phone (to AT&T, if that makes a difference)?