Normally, I'd recommend you hold out a little while longer to upgrade because February through May is generally the dead period in between phone generations.
However, you seem to be less intrigued by high end specs and therefore probably don't need to wait. In that case, I'd personally recommend the smooth transition to a SGS2. Having read your post, the Galaxy S2 seems to be everything you're looking for. Plus, if you shop around you can get a really good deal on them now.
"If you have an apple and I have an apple and we exchange these apples, then you and I still each have one apple, but if you have an idea and I have an idea and we exchange these ideas, then each of us will have two ideas."