Thanks for all the suggestions. I'm going to check out both the Galaxy Nexus and the SIII. Apple usually releases the new iPhone around September, right? I'll wait to see what features it has.
@tubemonkey: Thanks for telling me about the iPod app folders. It has made my iPod interface so much neater. I put all my apps in folders and they're all organized now.