Go for the SGS2. Then report back how it compares to the iPhone 4 in an extended real world day to day use test.
That said, I highly doubt there's any Apps that will be ran faster on the SGS2 compared to the iPhone 4S. Camera also pales. You are paying for variety basically. Not so much a problem for many tho.