Did Moses intentionally sin against God at the waters of strife?

Famous Question, many answers. Most popular was that of Bible commentator Rashi, who mentions that Moses was trying to find the rock that God had commanded him to speak to and the rock hid away, so he felt pressured to hit another rock as he did many years before. The Bible commentator Rambam on the other hand comments that Moses did show unnecessary anger at his people as he says "Hear now, ye rebels", and that anger was reason alone for his punishment.