We finally switched to a local company

https://donovanjxle458.lucialpiazzale.com/water-heater-service-for-wildomar-homes

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