Yep, I'm in the same boat as you - "almost" ;) All I'm waiting for is the hardware upgrade announcement (WiMax, 3G).
I went from a Razr to the iPhone, and I am a huge fan. I finally can use my phone for my calendar, contacts, check things like weather/stocks, full video ipod capabilities, and so on.