Andrew, I don't think you screwed up at all. The wrapper comment seems like a non-issue, and the second comment, well, that wasn't so great but it wasn't awful. I wouldn't worry about it. If she's not worried that you catch her texting the OM, you shouldn't worry about such a small comment. I'm getting really angry at her now. And I don't even know her. I so get why you were (and probably still are) so angry!
I wonder if you could meet with a coach only for one of two hours? It's not that much money for that much time, and it can really make a difference not only in your outlook, but also in how to manage this sitch.
In the meantime, know I am sending you my positive thoughts. You have a friend here.