You're probably ahead of me, but I was thinking you might consider a white shirt to see how it looks.

The black shirt just seems a tad severe for a holiday occasion...and seems to overpower the beautiful tartan. A white shirt may put more focus on the kilt and tartan colors.

Ron