I am doing the same. I will possibly hold off until 2021 at this point.I've been waiting to purchase a RAV4 hybrid until the battery issue/fuel tank issue are hopefully resolved. As with all manufacturer issues, you have to complain and document your concerns
for Toyota to take action. Dealers don't usually do much, but making the defects easily searchable by filing a complaint here can speed things up: File an Online Safety Complaint | Safercar.gov | NHTSA
Best of luck to you all, as being stranded in the middle of nowhere due to ongoing battery issues is not a comfortable situation, especially in these times.