LNG- that's a tight line to walk- esp when there are children. I would try to go a bit w/ NC and if there's any at all, it should be about the little one. Everything else though is spot on, the PMA, smiling, upbeat, and detached.
It is hard and it is uncomfortable- but it will also protect you from beig tossed around emotionally and allow you to detach; at the same time- he will notice that you're not there, initiating or immediately responding.