I think a more likely comparison would be between these two setups:
...
So it's really a difference of $9k plus tax difference - so close to $10k -- greater if you ordered your Model 3 late and will not qualify for the Federal rebate of $7500 -- though Nissan is getting close to their limit as well.
For myself, as mainly a commuter, the Leaf is a very attractive option. Yes, it's not as sexy or peppy as the tesla, but I've been very happy with the 2013 Leaf as my daily driver and can only imaging Leaf 2.0 being a lot better. I am a bit worried by the fact that Leaf resale values have dropped like a rock, but I'm not sure how much that matters if I resign myself to driving my cars for at least 10 years - and yes, I'm keeping my old Leaf. Though honestly with a Tesla, I'd be more likely to want to update more often once Tesla announces autopilot 3.0.
So I can't really decide...