Don't wear the Black Watch. Everybody and their grandmother will have on Black Watch, especially if it's their first Games.

The Scottish National is a great choice. It's Scottish, folks will recognize it and appreciate it for what it is, and nobody will give you grief about clan affiliations. AND.....it's a great-looking tartan.