This was a very sizable move in the positive direction!
I don't see anything wrong with him coming in - I'm kind of glad he pushed passed (could have been a bit more polite, tho!), as it allowed more R work to be done. H seemed to be making peace, and you were able to plant a bit more mystery on him, as well as receive an act of service (AOS) (printer fix) from him.
Were you able to thank him or provide any words of affirmation (WOA) about the kazaa lead or the radio gig? Or were things kind of tense? The humor about the computer purchase was great! More playfulness might help to fast-track this back to a nice positive level.
An 18-rated dream diary. Hmmm! Sounds interesting!