Like others have said, pick your battles and don't get into 2 hour lines. Also, heading up to DS's first trip, whenever we were in a line (grocery store, target, whatever), I'd point out that when we get to Disney World, we're going to have to wait our turn, just like we're doing now, and he had to stay with me and not be a crazy-man. By the time we got there, he at least understood that we had to wait and (for the most part) that he had to behave.
There's also a ton to look at in many of the lines, so that helps.