If you go with #2 you might think about using some of that Feliway stuff to help her stay calm. I've never used it, but from what I read on the board, it sounds like good stuff.