He's doing a nice amount of AOS for you! And you two are talking again! Very good positives, Jo. Sounds like the sitch has turned again. Is it just me, or is he offering help more, with you not needing to ask for it as much?
I appreciate S5's hugs as well. Sometimes I'll just reach ove and his hand or kiss the top of his head, all just fine with him UNTIL there is another little boy or girl nearby, and then I'm kept at arms length.
Your school/work stuff sounds like great PMA help. Nicely done.