I need a new cell phone what should I get?

I have an iPhone and I need to get a new phone but am not sure what to get. I like my iPhone but there are some thing that suck about it. I am also looking at the atrix but am not sure. I am familiar with the iPhone but I don't mind switching to an android based phone if that is better. Ido have AT&T and I am staying with them so if someone can help me with what may best suite my needs. This phone will mostly be used for music, video, Internet, and your basics like text and taking videos or pictures. Also is the android market somewhat similar to iTunes