"The angry waiter" (a tangential lab adventure)

I have a question for you guys, dear readers.  First, let me tell you a story.  Once upon a time, in lab, when we collect language samples, we tell the niños a story.  They look at a wordless picture book and we tell a narrative based on a script.  In one experiment, they actually listen to a recording.  One of the picture books we use is called "Frog goes to dinner" by Mercer Mayer.  In the story, there is a waiter who is probably a pretty nice guy, but eventually he becomes angry at a frog who is causing mayhem in the restaurant.  Frankly, the waiter is justified in his anger, and he'll probably calm down after the frog leaves.  One of the sentences in the script/recording describes him as "the angry waiter".  I think the exact sentence is something along the lines of "The angry waiter told them to get out of the restaurant."  (There is a similar sentence in Spanish that describes the waiter as "el mesero enojado".)

Now, I don't know about you guys, but I can't naturally use "angry" as an adjective unless it's a more or less permanent state, or if it is distinguishing between two people.  As in, the waiter who is always angry, or the waiter who is angry as opposed to the waiter who is calm.  If I were speaking naturally*, I would actually chunk it, "The waiter was angry.  He told them to get out of the restaurant."  But the proposed sentence "The angry waiter told them to get out of the restaurant" means something different to me; it suggests that the waiter is always angry, as in he's an angry person.  (I asked a friend who is a native-speaker of Spanish about the Spanish example, and she said it sounds wrong to her in Spanish too.)

*actually, if I were speaking naturally, I wouldn't have used the subjunctive there—I'd have said "if I was speaking naturally".  But that is another issue entirely.

What about you guys?  If you were talking about a waiter who had been calm and then gotten angry, could you naturally describe him as "the angry waiter" like in the sentence above?  Go ahead and comment if you'd like; I'd like this to be a conversation.  If you have trouble with comments, you can send me an email.  I put a link to contact me up next to the "about" page, for any wug- or blog-related emails.