Well, I waited, but only a day. Now rocking CyanogenMod 6.0, and loving it.
I had previously run CM 5.0.8, but got impatient at some point and flashed a leaked, rooted FroYo ROM. Shortly after, I got the OTA FRG22 update, and lost root. I've been been missing my root and CM ever since.