Dispute over vacating house, Painting and geysers replacement

Dear sir I am in a rented house in Bangalore from 2018 July, Rent agreed 16500 including maintenance, in June 2019 we revised to 18500, next one was to 7% increase but due to covid we did not do renewal mutually. Now I gave my landlord 1 month notice to vacate ends 15.04.21, he is delaying visits, though he came 11.04.2021 with some paint company took quote from him and went off without telling me anything, I heard 17000 but in the same building others are doing pairing at 7500 to 8000 . more over while we come to agreement he had agreed to install a good geyser of 9000 value but brought 3000 wala, it failed once company replaced it, again it failed due to same problem leakage, co rep told me this model has very much complaint and we have to go for next model which is improved, 2300 was the difference amount but my landlord says I have to replace the geyser. in reality I was not using this because of the problem it gave, I have registered complaints with manufacturer due to covid it got delayed and they did not show interest in replacing, in both landlord want me to listen to him, in fact the condition is to handover the property in good livable condition, I am ready but he is coming with lot of innovative ideas and companies to trouble me deduct my security deposit of 120000 how can I handle this situation. Please help me.