Ok, so apparently I'm in the minority here...but the 4 is a perfect fit for me. I have no need for Siri, turn by turn directions I get from the MapQuest app, the camera works just great (how often taking panoramic pics anyways?!), I have a ton of apps and the speed is still quite fast; saved myself a ton by choosing the 4 and it will suit me just fine until next upgrade time!
Go get the 4S, i was a long-time BlackBerry user and decided to get an iPhone 4 just to try the platform and i loved it, used that phone for almost a month and now i got a new 4S i got on a very good deal. But differences are really not that much, only thing that REALLY stands out is the camera.
I would go with the 4S and try to keep it on IOS 5 if you can until some bugs are fixed on IOS 6. It's fast, responsive, and mine has good battery life.