We finally switched to a local company

https://josuemrjs628.clearminster.com/posts/signs-you-need-a-water-heater-replacement-in-murrieta-2

We finally switched to a local company instead of the big chain and the difference was noticeable