I think ADD or ADHD symptoms can vary from person to person. I have ADHD and prefer (emphasis on prefer lol) to keep things very organized and clean. Maybe thats OCD idk lol. My husband, on the other hand, whom I strongly suspect also has ADHD, is one of the messiest people I know.
As for whether or not you have ADHD, have you seen a doctor? I'm not an expert but I know there are a lot of multiple symptoms that go along with the diagnosis of ADHD. I had a bunch of mentally painful tests done. At least I know, I guess? good luck!