The phone dilemma

I have a two year-old iPhone 4 I need to upgrade.

The iPhone 5 is out of the picture because of the different form factor. My Mophie won’t work with it, and there aren’t any cases for it yet.

This morning, I went into both an AT&T store and an Apple store. Apparently the only iPhone 4S I can purchase is the 16GB. This would be a significant downgrade from the 32GB model that I’m currently using 26GB of. Furthermore, because I’m using my mom’s upgrade, buying a new iPhone at the Apple store would mean that my mom’s line would be deactivated until I ran over to the AT&T store to reactivate it.

I’m taking this as a sign I should finally make the switch to Android. What should I get instead?