Other Fuel System Tank Assembly problems of the 2016 Toyota RAV4

I used to take full tank gas everyday since bought the car . After driving 1 year my oil tank giving me problem. My engine was suddenly shut down automatically and 3 sign came up. I started the car again and it was working good and after a while it shut down again. I went to my dealer about 5 month ago and told them the story. They diagnose my car and found nothing so I took my car back from dealer shop. Next day same problem happens and I went back to the dealer. . This time they found my batteries almost finished and I have problem with my air sensore . So I fixed both of them and paid almost 1400 dollar where parts cost was only 300 and rest was for 5 hours computer digonoatic. Anyway, I thought my problem is finished but it's still there. Now my gasoline coming out from tank and I am getting smell from inside. I again went back to dealer, this time they keep my car for 1 day and next day they telling me that I have to change my entire gasolin tank because I used to take full tank gas,which will cost around 2000 dollar!! I was very mad with the manager because in first time they couldnot even find my real problem and changed my new batteries and air sensor! now they telling me it's very dangerous to drive without fixed oil tank but I didnot fixed it because it must be factory defect, why should I pay from my pocket. I called Toyota corporate office and told them about my issue. They told me since I have no warrenty, they can't fixed it free for me. And there are no recall about my gas tank!.