I think you've got angst figured out just fine.
I loved the idea of her realizing her mistake and actually doing something about it. And I'm a sucker for her breaking into his apartment. I like that he didn't immediately coddle her and was a little irritated and too tired to have the conversation immediately. She needed to stew a little bit. Just lovely!