I don't think it is possible to come up with a definition of "Zionism" which will please everybody.
Except most of these other definitions don't really matter to the current situation, right?
The one that does matter is Herzl's of course, which is the one that the State of Israel unequivocally operates on. More specifically the Jabotinskyian variants that have been the foundation of its consensus policy since 1967 (and much more firmly so since Begin).
I agree with you. Both Herzl and Zabotinsky saw Zionism as Jewish nationalism. Some "dissident Zionists" disagreed, but their views are irrelevant to the mainstream (and even many of the fringes) of contemporary Israeli politics.
Another example of "non-standard Zionism" was Canaanism [0], a 1940s outgrowth of Revisionist Zionism that wanted a Hebrew nationalism rather than a Jewish nationalism, and sought to include Arab Christians and Muslims on the condition that they start speaking Hebrew instead of Arabic, and adopt a new "Hebrew" ethnic identity in place of their pre-existing "Arab" one. But despite having significant influence on the development of Israeli art and Israeli literature, politically Canaanism was always a minuscule irrelevancy.
Except most of these other definitions don't really matter to the current situation, right?
The one that does matter is Herzl's of course, which is the one that the State of Israel unequivocally operates on. More specifically the Jabotinskyian variants that have been the foundation of its consensus policy since 1967 (and much more firmly so since Begin).