3GS users have waited more than 12 months. I haven't upgraded yet, but that's because I wanted to wait for the lines to die before I decided on what I wanted to get.
The 4S is looking mighty tempting though, and I was going to get it unlocked. (Because I hate being locked to three year contracts, stupid Canada.)