It was the last hole. Probably could've snuck up to the second to last, but it would've been a stretch.
We are the same size. It sounds like the 36" is to the last hole. Did you find that you used the 3rd or 2nd to last hole on the 36? If so I might still buy it at 38 or even 40 depending on your response.
As far as shirts are concerned, I don't even bother. I have a size large body with XL arms so unless it's slim fit, I can't ever order a long sleeve shirt.