You sound very similar to me, and I am most comfortable with an "OSDD" diagnosis though I don't really pay attention to diagnoses anymore. I often feel like diagnoses just make things worse bc then you're basically told "oh so here is this label with distinct diagnostic criteria" and then, lo and behold, you start to sort of develop those criteria even if you didn't see them in yourself before.