I was in the same dillemma too after being tempted by Jelly Bean.

In the end, I decided to stick with my non-G S2. There are just too many compromises to make in terms of battery, camera, storage, and most importantly, processor. I've used the Nexus a few times and I'm not impressed with the performance. ICS on Exynos is butter smooth compared to Nexus.

Jelly bean will come to S2, whether it's cooked ROM or official.

Conclusion, I decided to wait for the next Nexus, which will hopefully be a proper hardware upgrade as well.

yes