So, after talking to some friends I get that I don't need to 'avoid' W. I need to do whatever I would normally do and if she's around just be me.
As far as dinners, we're giving the girls a mixed message if both of us are at the table with them. We're separated, room mates. So I'm going to suggest we alternate days having dinner with the girls.