I would cross-shop the Bolt if the size works for you. It's a little narrower (passengers sit closer together) and trunk/hatch is smaller, but otherwise the same as Leaf. There are lots of good deals on used Bolts right now, and will provide longer range and longer longevity.
A troublesome...