As others have said, for a commute like that, don't get a 24kWh Leaf. 30kWh should be your dead minimum.
You may also consider a used Tesla Model S. 85kWh battery models for $45k, if you can afford that.https://www.tesla.com/used?model=ms
If you get a new Leaf, as others have suggested, lease instead of buy. It likely will work out cheaper if you do decide to buy out the lease, AND you're not stuck with it if you decide the range isn't good enough.
Otherwise, you could look into a Volt/Bolt, but I hate Chevy, so it's not an option for me, but you may not hate them.
Having a 6.6kW charger instead of the 3.7kW charger is nice, especially if you can pop into a place that has L2 charging. Wishing my 2012 Leaf had the faster charger, but oh well. I will have my Tesla Model 3 in about a year's time. I can survive until then.
Pulled the trigger on going EV on 10/2016 with a 2012 Leaf, and a Tesla Model 3 reservation expected to receive in June 2018.