Which style of white dress shirt is correct to wear with the Black Argyle Jacket and Kilt?

Last Sunday I wore a white dress shirt with a red wool tie to the Kirk'in. (along with my Kilt and Argyle Jacket of course) The shirt had a spread collar and french cuffs. In my opinion the spread collar looks more appropriate with the Argyle than a button down collar.

Are french cuffs the correct attire for this sem-formal look and should a shirt with barrel (button) cuffs be worn and the french cuffs reserved for wear with black tie?