So I restore....upgrade and then re-sync to iTunes and Calendar? What's the advantage?

You can do it in that order sure. Advantage? Look at it this way, if something on that backup file is corrupt causing some sort of issue for you and you use that same file on a fresh install you may run into more issues. If things are fine now, then just upgrade like normal.