Update: no more diapers|
For a while it was getting awfully snarly, but then someone turned us on to spray-on leave-in conditioner. We use I think the Aussie version and it's helping a lot. Crazy, we like. Tangled, not so much.