Sounds like you are on the right track. As for the litter box, did she pee and poop in it? if not, just pick up her poop and place it in the litter box. She will go in and try to bury it.
you know, if you don;t want to feel exhausted...you may need to move in with her...
sleeping buddies