It seems to me that perhaps we focus too much on battery size and not enough on "what for?" If I lived in Canada and wanted a BEV as a primary car, I'd be hard pressed to find one that really meets all my needs. However, if I want a second car for local driving, a 30 kw Leaf will fill my needs easily (if you want to see a very long analysis on primary vs second car use, check this out: http://www.sciencedirect.com/science/article/pii/S0968090X16000371)
IMHO a BEV can be the perfect second car for local driving. I don't do more than 50 miles/day so a 30 kw Leaf meets my needs for a second car. I routinely do long trips (700 miles) so my primary car is a Lexus ES350 - a great highway car. Most of the time the Lexus is under a cover.
So to the original question, Tesla or Leaf, considering my needs for a local car, I'd be hard pressed to justify $50,000 for a Tesla as a local car vs a Leaf at about $30,000 MSRP before incentives and discounts, which can lower the cost considerably.
You asked what for is the BEV? I already mentioned I need it to gover 90% of our driving needs, which includes my wife's 140 mile round trip once a week. There isn't a charging station at her employer's building (used to have them previously at other locations).
Gasoline is 50% more expensive here than it is in the bordering NY towns (Niagara Falls, Amherst, etc.) and electricity at night is pretty decent at around 12 cents (9 cents USD) per kWh from 7-7 so the break even period for a BEV in Canada can be much shorter.
We have an 11 Accord and a 16 RAV4 Hybrid and eventually we'll need a third car for emergencies when our eldest child will have obtained her license because we have a toddler who will be in JK next September. We are not selling either of the two vehicles which is why we can afford to sit out an wait for that BEV that can cover our needs. Like you said, for long distance driving, I don't mind taking either of the ICE vehicles as they're really not gas guzzlers or just rent a car when flying across the continent.
The Accord is worth $10k USD if sold and it has not problems whatsoever and I still have extended warranty on until next year end. No point getting rid of it to buy another vehicle because it already has electronic stability control, which is probably one of the best safety features invented after ABS.
The winter climate in Toronto is a little worst than many parts of NY in terms of frigid temperature but we don't really get too much snow fall or snow storms so our winter will be better than Minnesota or adjacent states.
If there was no rumor about a 60 kWh battery pack for the Leaf, then I would definitely strike it off my list. I am a little hesitant to go with a Tesla especially if the ESA is inferior because it probably comes with average to below average reliability in the long run but the AWD options seems good. We tend to keep our vehicles longer and so may be able to splurge a little but not at the expense of significant increase in ownership costs, which we aren't used to owning Honda's and Toyota's.