I have heard the Storm is coming to AT&T next year and it should have Wi-Fi.

Also the "Magnum" is suppose to be announced in May. I might just wait for that.