Same situation as you. I was going to upgrade to the S2 but am now waiting for the S3 that is due out in the spring, sometime around April I think. I'm not interested in the droid yet, but I do think that the Android OS is where all the action will be in the future.
Storm 3 will most likely be out in November of 2010. They are going to show it at the WES conference in April.
Posted from my CrackBerry at wapforums.crackberry.com
