I am buying another iPhone next week and I am sure they are going to put 2.1 on it. Hopefully there will be a WinPWN by then(for windows) and I won't have to worry about it.
when I bought mine it was unlocked with 2.0.2 without cutting the sim. I didn't know about the update yesterday and I restored my 3G iPhone yesterday morning and here I am with 2.1fw.