I would root with unrevoked now, BEFORE the gingerbread update. Then you *SHOULD* be able to take the OTA normally, assuming you defrost everything in Bloat Freezer , which will cause you to lose root, but then because you rooted with unrevoked you should just be able to push a zip with the su and superuser.apk via recovery to re-root your phone.
If no one else does a quick write up for this, I will, it is easy and what I did for the last update.