Sounds like your making positve progress to me either way. Just keep doing what your doing and be patient. Keep working on yourself so when she decides to start working on you guys you will be where you need to be.
Learn to laugh at it. People are people and everyone is human. Choose how you will act and don't re-act.
