It will be easier if you wait for the update to hit you. That way you won't have to unroot and then reroot. They are rolling the update out NOW. It might take you a week to get it. At this point, might as well wait.
When you DO get the update, the first thing you should do is get Voodoo OTA Rootkeeper and follow the instructions as you root. This makes it really easy to unroot when the next update rolls around. After you update, you can reroot.