Well, sort of, anyway.
I've decided to scale back my hours a bit—I was getting waaaaay more than “slightly” cranky. The way people pronounce words was starting to annoy me—I think that's a good sign I was working too much. Not to mention, with these new late night hours, I was working more hours for the same amount of money—and I was working so many hours I couldn't even pick up a first cut shift to make some extra cash. So I emailed Lapdog and asked to be taken off two of my closing shifts. He didn't deign to respond to me, but he did take me off one of them next week. So that's a little bit of progress.
I'm really thinking of trying to get an hourly job, and cutting my serving shifts back to a minimum. Of course, I think that all the time and end up not doing it. But with this semester almost over, it would be a good time to switch to an hourly evening job and daytime serving shifts for the summer, or a mix of evening shifts. We'll see how it goes, I looked (half-assedly) for a second job last summer too and it never worked out.