PS, By working together, you've taken the shameful piece out of the picture, which will help him build self esteem.
He definitely sounds like he has ADD traits, needing to push the limits to create tension and drama ( stimulation) in order to organize himself to act responsibly. The fact that he asked for you help is huge. Kudos to you for your self control. Now go reward yourself with some quality alone time!
