I agree with you on the good deals after dieselgate. We got the cheap lease special, the $1000 VW loyalty cash and a $3000 check from the state of MD. We're into the whole thing for about $20k. The 2018's with better range weren't available when our lease was up, and even if they were, the cheap lease was gone and all the Model 3 buyers sucked up all the state money. That's why we decided to buy it out. I have resolved myself to the fact that when it's done, it will be sold for scrap value. I just hope that I can get another 5 years out of it first.
To the OP - sounds like you've got it figured out on the Leaf. I say go for it! Our e-Golf has a 3.6kW on board charger, so it wouldn't meet your needs (you need the SEL or the brand new ones to get the 7.2kW) There have been very rare occasions where we had to leave the EV home and take a gas car because it wasn't charged in time.
As for the Focus EV, I looked at it, but one look in the trunk and I was done with it. Our e-Golf gives up nothing to a regular Golf's functionality. It's a weekly commuter with one parent and 2 kids 5 days a week and the family grocery getter and runabout on the weekends.