Nice electric car orphaned by Mahindra Reva

I am a electrical carage user for last 10 years. I drove Reva since 2009 to 2017 for 90000 km. It was am excellent car. Unfortunately Mahindra after taking over Reva closed its production and came with e2o plus. I have p6 version since 2017 and have driven it about 21000 km. On my transfer, I shifted it from Delhi to Thiruvananthapuram. Here the service is extremely bad. They are not able to rectify the defects and takes months to procure every part. It's gear get stuck up every now and then but they claim it is ok. They promised to change cell of battery but couldn't after two months. It often shows zero charge though it is having full or near full charge and thereby don't start and start after five to ten minutes after repeated off and on. It is in guarantee period but I want to getrid of it if Mahindra take it back. I am afraid what will happen after guarantee period. I wish old Reva come back.