Still too snug, but yes, best fitting so far. And as I said in the message, a quick (but unrelated to fit) improvement would be to get collars large enough, or spread enough, to rest under lapels.
Like these bad boys:
As far as underarmor...just roll it up. If you wear sleeveless, your arms will get cold. I just roll mine up to mid forearm. But there are a few pictures of me on here where you can spot it sticking out from my shirt cuffs.