I did what you are contemplating - got an unlocked 4S after having my 3GS for 2 1/2 years.
You won't be disappointed, the 4S is so much faster at everything. And Siri is amazing. The only downside is that I have started looking for the 'Siri button' on my iMac.