I considered waiting myself but broke down and bought the 4S off contract. I figure I can easily sell it when the next generation comes out and that will cover my upgrade cost for the new phone.
Just bought a black 64 GB iPhone 4S off contract because I couldn't take my old Droid X anymore. I have an iPad 2 as well and have been eagerly waiting to get an iPhone.