I was in a similar position, my S was only 6 months old but i was due an upgrade.
I was apprehensive as i kept thinking the S was still a very good / nice phone and my plan was to wait another 6 months to see if anything new would come onto the market after the S2.
In the end i was offered