Here in Ireland my friend got a 40kW battery system installed for €5,000.- and got to keep the old batteries to use as extra storage for his Pav system.
I bought a 2015 for my spouse 14 months ago. Similar circumstances. She now all but refuses to drive anything else. It cost me €9k or about $10k.
Absolutely delighted with it. I may wait another year and replace battery with a 40kWh, as my friend did and then use old Leaf battery as a reserve...