^ This.
I'm keeping my Micra for another 2 years-ish and then I'll probably trade it in for a Tesla Model Y. I figure they'll have it fully sorted at that point and battery capacity increasing...