Unfortunately, it may come to that, these updates can make things go a little wonky, and it's not always apparent right away. Your old data and settings may need to be cleared and the only way to do that is with a factory reset. I don't think anyone realized the issues going from 2.1 to 2.2, you're not the only one in this boat.