You should give the new BMW i4 a test, it's probably a much better car than the BMW you had. Built quality of BMW combined with the advantages of an electric car without the "features" of Elon Musk as discussed in here.