I'm in the same boat and I haven't found anything worthwhile to upgrade to. The most likely scenario will be to upgrade and sell the phone and keep the S II until something stupidly awesome comes out.
Actually that's a good point and probably my best reason to upgrade. SGS2 cost me £10, it's a year old, immaculate condition. What could I get for it come the end of the year?

