ADHD or OCD ? ( or both ? )

A while back on this forum, it was mentioned that sometimes, folks with ADHD can be very fastidious, neat, tidy and organized. I for one...have been the type that has struggled ( life long )  with clutter, disorganization of my living spaces, not cleaning messes, not picking up as I go, not folding clothes and putting then away, dropping things where they land ( all over ) and generally speaking...I've been a mess! I might be what you'd consider a classic ADHD male when it comes to home duties and organization.

More recently, I've found a partner who also has ADHD, which is my first official ( that I know of ) relationship with someone who knows they have it and is medicated. While I can see it in her in many ways, though she's more introvert / inattentive and I'm more hyperactive/ extrovert, the biggest difference between our inherent tendencies is she's immaculately clean and fastidious about the household.  She's exceptionally good at organizing and decorating and keeps a very well kept, clean,  tidy home. To the point, beyond what I see as average. Above average for sure!  Which definitely keeps me on my toes and I've had to learn very quickly to up my game and follow her lead in order to keep things copacetic between us. I'm proud to say, I've really done a good job all things considered.  The best I've ever done in my entire life.

There's only been one person in my life who I can compare to in the neat and tidy department and that was my mom. She was out of control in her cleaning habits at times and I always thought of her as OCD. She also, I'm more than a little sure, had undiagnosed ADHD which is where I got it. I also suspect one of my sisters having ADHD as well but she's more like me by nature.

So having said all of that, I'm now wondering? Is this still ADHD I'm seeing in my partner? Or is it more OCD? Do ADHD people sometimes go completely to the other end of the neat and tidy organized spectrum and it still being ADHD, or is this a comorbid OCD / ADHD combination type diagnosis? This would also help explain my mother which I've always been curious about as well.  I would appreciate any input on thus subject especially for me because it's very relevant to my partner.

J