No, the phone.
And no, not what I mean. When I said "upgrade" I was referring to an "in place upgrade", where the update changes the system and leaves your apps and data there. In both windows and android this always causes problems or performance issues down the road so its always best to start clean.
I have backed up using PC Companion, is it possible to factory reset and then restore using this?