To your points. 80-90%. That was the Nationalism part. In Nazi Germany, we the people couldn’t fight. They took the guns.
As far as the Nazis "disarming the people," the story is a good bit more complex than that.
In 1919 and 1920 the Weimar Republic, long before the Nazis got going, passed strict gun control laws, banning all private possession of firearms.
In 1928 the Weimar Republic greatly reduced these restrictions, but put in place strict registration and licensing requirements.
This law remained in effect under the Nazis till 1938, when the Nazis passed a law making guns much more easily available to the people. It completely deregulated possession and transfer of long guns.
Jews were, of course, generally prohibited from possessing guns.
IOW, the common idea around here that the Nazis came into power in a well-armed country, confiscated all privately-owned firearms, and only then launched into their atrocities, is just not true.
http://en.wikipedia.org/wiki/Gun_legislation_in_Germany#The_1919_Treaty_of_Versailles
It should be noted, of course, that Germany under the Nazis did not have real rule of law. The whims of officials were usually more critical than what the actual law might say.