Boy, Superdad is right on with his comments and I totally agree with him. Great to see that you are realizing things about W's role in your former R (i.e. the controlling issues). I think you are doing a great job staying strong and confident when communicating and being with W -- it is likely telling her a lot! Awesome baby steps too (all around good stuff)! Also, your attitude about where your R needs to be before you yourself really want to reinvest in it is well-seasoned, not to mention something for all of us to aspire to.
Keep enjoying your picnic and rock that ZZ Top and Pink Floyd like no other! I saw Roger Waters several years ago and it was one of the best shows I've seen (most of the shows I've seen have been pretty awesome though).