It has always been my habit to refer to the people of Scotland as Scots, and the "things" of Scotland (the Highlands, kilts, etc) as Scottish. I reserve the use of Scotch solely for the whiskey.

Those of us unfortunate enough to be born outside of Scotland I like to think of as of Scottish heritage or descent.

Works most of the time, though there have been the occasional exception.