My exact thoughts. My 2 year commitment to AT&T (non iPhone) ends in two months. I'm hoping for a 32GB (or more) iPhone w/ video to come out by then, or some time during the summer, likely coinciding with 3.0's public release. ...or I could just be pipedreaming...