Gabe- Good to see your interactions with XW are more positive. The swim lessons may be a good thing to help on the communication level. Just remember to always be positive and upbeat!
Try to stop worrying about what she thinks of you. You know who you are now and you know what kind of person you are becoming. That's what matters right now. She still has issues to work out on her own.
How is the house work coming along? Holidays are just around the corner! Make them enjoyable for you and S6.