I honestly think he had ocpd on ocd (I'm planning to make a rant on this one sometime this month since it's disability month and ocpd and ocd ARE a disability but that one is taking sometime to finish)
but yeah, his OCPD isn't gone, we see the impact of it in his day to day life, like self blame (sometimes it can be blaming others instead of yourself) is an another big of part of OCPD, which is a coping mechanism amid to control the narrative.
We see this in how he rationalizes cruise, like blaming his lack of foresight regarding Madam Yao's strategy pouches for the Sparxie con happening , or blaming his presence at the TV station for Miss Fulwish's actions there . These events were inevitable, yet he reframes them as personal missteps. most people won't be jumping to these conclusions everytime something bad happens.
there is also the mask being forced on him by madam Yao and his reactions which is one of things I'm planning to address in that rant.
He still can't see himself as just a human that can't control everything or anything.