I'll wait for my upgrade and most likely get either an 820 or a 920.
The size and weight increase of the 920 are making my decision difficult. I already feel like my 900 is a little bigger than I'd like at times. The 820 has a lot of features I like but it's missing the one I want most, the HD screen.
It's going to be a tough call, but it's just as well because it makes it easier for me to wait since I want to see if there will be a better option. I'm pretty loyal to Nokia and prefer their phones to any of the other brands, but anything is possible.