Oh, you actually have room in the Medium? Thought you didn't. In that case, it sounds like we have nearly identical measurements. Try that Ashland Small. I'm wearing one today, as it happens. They fit me better than any of my OTR and some of my MTM shirts.
NYR, fantastic. Glad to see that Vanda on you!