I support civic nationalism, which I believe the modern Scottish movement inhabits.
Let us always support yet fear civic nationalism. For the rise of nationalistic authoritarianism will come not blatantly, but in a subtle manner, like a spy in your midst. Civic nationalism can be used as a noble means for noble ends, but it is also the beginning of other, less noble forms of nationalism.
You make a good point here. There are two types of nationalism. One deals with maintaining the proper relationship between government and citizens, and the other deals with violence and jingoism. It is common for the self-proclaimed opponents of nationalism to confuse the two, but there is also an ever-present risk of the two coming together (not least because of the anti-nationalists who are eager to malign civic nationalists for using the wrong label).