Yes, it does sound like you have a component of OCD among your Aspie traits. That is not unusual for us. I have some, too, but they don't really cause problems for me. I think you also have the common Aspie trait of not being able to handle change well. I definitely don't handle change too good. I don't go to Walmart often, so when I do, I always find some stuff rearranged from what it had been on my previous visit. It is very unsettling. I really don't like people to spring sudden plans or changes in plans on me, either. Although there is no cure for this, it might help if you cut down on caffeine, sugar, and any other stimulants. That would help you to better control yourself when the unsettled feelings occur. You should also try to find things to distract yourself when an incident happens.