I'd take the iPhone. The Storm is a bag of hurt.
iPhone 3g escpecially with the new 3.0 software. It looks awesome!!It has a lot of new thing that people complained about.
If your talkin about the GSM version of the storm yes it has wi-fi. But why am I saying I-Phone?
Well Ive been using the Storm and there are some things I really like about it. Im not locked into a contract with it so Im gonna roll with it for a while and if I get tired of it I can always just sell it off and get something else.