I hope the mp of the camera isnt the deciding factor for you in which one you order. Megapixels only affect the size of the picture, not the quality of the image in any way. Although the new 4S does have an extra lens and a wider aperture, and apparently the camera is one of the things about it that they're very excited about.
Personally, I'll apparently be skipping the iPhone altogether since Sprint decided to change its upgrade program and I'm no longer eligible. Way to go Sprint. By the way, anyone know where to find out what my cancellation costs would be?