Firstly, never lease an EV. They last way longer than you're led to believe, so you're better off owning it, and you can avoid being extorted on lease fees and the higher interest rate, and your finance company won't let you use a car on a novated lease for uber.
Secondly, why upgrade? I'm in...