I'd probably be happy to trade up and even pay something for the privilege -- but no-one at Zero has suggested that is an option.
Like FlexyDude, I am waiting for the repair kit to be shipped -- but my bike is sitting unusable in my cellar rather than at the dealer, and for various reasons I kind of doubt I will be riding it for the winter.
I have also been told that the repair kit will be ready in a week or two and that I am "first" on the list to get the repair since my bike is unrideable (it starts glitching after about 3 miles and then once per mile once it starts).
And, Peter, it is not really a question of stocking parts -- the problem is that for a few of us, replacing the motor does not fix the problem -- it just comes back after a few months to a year (I had a year of glitch-free riding before the problem came back with a vengeance).
The good thing is that Zero is supporting these backs even thought the warranties have expired (though in my case, at least, I think they ultimately have a legal obligation to do so under NY's lemon law).
Meanwhile, I have been enjoying wife's lighter and more nimble (but not as fast) 2013 XU, whose stalling problem seems to have been a simple problem of loose batteries.
--Karl