Seriously, everything from the car wash to the undressing boundaries (taking note) and how you just keep rolling right on. FLAWLESS. The best thing - it was for YOU! Exactly what you should be doing!
Kids are so smart, so intuitive and they just know things. I LOVE that she called him out, that's surely something he'll be thinking about.
I think the hug showed your character - you are a good person. You are doing the right thing. Compassion and understanding (with boundaries) are going to go much further than a cold shoulder IMO.