"supposivley though it might be soon"
There are always rumors of this, but nothing substantive, and I doubt that this will ever happen. I suspect that AT&T signed a pretty ironclad exclusivity agreement w/Apple (they've probably already lost a ton of money due to all those people unlocking their iPhones). From the sound of it, AT&T needs high profile phones like iPhone because I've yet to hear anybody sign up based on the quality of their service alone. They need iPhone, and they;re not about to give that up this June, and not bllody likely the June after that.
On the contrary, if you're fixed on service, you go to Verizon.
I've got Verizon and when my upgrade came through, I got the Voyager (a bit over $100 after rebate). It doesn't have wi-fi (few Verizon phones do) or downloadable apps (even fewer) but it's got an SD slot that can hold about 8GB cards. I've got a 4gb card in and enough room for like a dozen movies. I can surf the web (although it's the Verizon-sanitized version - but if you're sticking w/Verizon, then it's no issue) and watch movies.
You might also look into the Omnia - it's more expensive, but it's got wi-fi.