Frank, you sound like you're in a good place for YOU right now, that you can say that your glass is more than half full. Work on getting it full. You handled yesterday really well.
Sounds like your W has a LOT of issues with her own individuality, feeling like she is needy and needs to follow her impulses, etc. This has NOTHING to do with you...it's a stage where she's being self-centered. She's testing whether being an individual and being married are mutually exclusive, and you're just showing her that they're not. You can be a couple that has a night where each does something different, and still be OK. People can have their space and be in love.
Hang in there. Just be yourself, give her space and take care of YOU. You DO deserve better, but also be patient with a person you love while they figure their life out.