iPhone 4 or 4s?

I'm struggling to decide what phone I should get as an upgrade from my current phone, a blackberry. I really don't use the blackberry for email or even web, just phone calls and texts. The iPad is my primary tool for email and web, as it should be.. it's larger and easier to read/write content on.

I know I want an iPhone but I don't know if the new 4s is really something that I need. Here are some of the main pros and cons. We'll start with the cons first.

Cons of buying a 4s:
-Price.. obviously. A 16gb 4s costs $200 while the 16gb 4 costs $150 and the 8gb 4 costs $100.
-I don't really need the personal assistant Siri. I don't do business on my phone, so I don't make appointments that need to be changed/moved and I can type my own text messages.
-iOS5 is available to all iPhones.. not just 4s. So i don't need the 4s to get iOS5 and the new apps/features that come with it.
-The iPhone 5 will probably be out in a year. If i take the 4 now, it would make it less expensive to upgrade when the 5 does come out.

Pros of buying a 4s:
-The camera is better in the 4s than it is in the 4. From 5 to 8.. plus the 1080 HD video capability. With a baby coming in January, it would be nice to have the 8MP over the 5 but is it really necessary?
-The A5 chip makes it faster. Twice as fast as the 4. But the 4 is still pretty fast.. what's another nano second?

Obviously I have more cons listed than pros. I still don't know what this means in whether I'm going to get an iphone4s or not. Part of me says, you don't need it, those extra features aren't good enough to warrant another 100 or even 50 dollars. The other part says, you probably should get the newest technology. The MPs in the camera are going to be better.

Anyone have any thoughts?!?!!!