To be honest, Allan, it doesn't really bother me whether I'm called a Scots git or a Scotch git, I think the word 'git' is the insulting word. I tend to use the word 'Scotch' as an adjective now and then and I must say when in English company, I'm often pulled up as they think it is an insult to us Scots. I'm afraid I can't see what's insulting ... is it because they are comparing me to whisky, or what?
Burns used the term Scotch and Scotchmen more times than I could mention. He also used Scots and Scotsmen so, as I said, why the fuss? As a teacher I learned not to rise to deliberate baiting, the angry reaction is what the children wanted and a smile deflated them. They thought they were insulting me only becaause some Scots would have agreed with them. Just smile and if the goading continues, gi'e them a guid, Scotch kiss!