I don’t think that your differentiazion between patriotism and nationalism is correct. Nationalism always began with the invention of nations through national movements. The nation building in europe began in the 18th century, not a thousand years ago. Nationalism always refers to the invented history of a nation (“a thousand years ago”), while patriotism can refer to the political system or the constitutional documents.

I think both are awful because there is a really fine line to chauvinism. The positive view of oneselfes too often comes with the devaluation of others.