I think 2 of them could be, I am not sure about water though, is there a thought process connected to the water or are you always thirsty.
OCD has repetitive behaviours I think its connected to a thought process of having to do it or something bad will happen, with AS stimming there is not a thought process like that attached to it.