Fun is good. I have a goal idea for you if you are up to the challenge. Three solid weeks with no squabbles or harshness even if he starts it. Is it possible? Is there a way to go Ghandi (and quiet walk away, I guess, don't know what you would do about his snapping) instead of stated boundary for three weeks no matter how irritable he is to see if it helps turn a corner? Have you two had three solid weeks of that since this started that did not involve avoidance?
