OCD is a mental illness that has nothing to do with neatness, it’s a life-interrupting illness. You’re not engaging in OCD behaviours. “OCD” as a colloquialism for being organised is something we should avoid so that we do not downplay the harsh reality of OCD or downplay the support people with OCD often need. The desire to be organised is the desire to be organised, you can say that instead.
I like to say I’m anal retentive about being organized. This, I think, gets to the heart of why this colloquialism even exists/persists. “Desire to be organized” doesn’t fully capture the _intensity_ that some feel to be organized. However, I couldn’t agree more with everything you’ve said. This colloquialism needs to die.