My water heater (I think Pana) less than two years. Sometimes can hear some noise (maybe from pump?) . Sometimes the heater turn off but pump still working so got water but not hot. After a while the hot water might work normally. What is the advice? Should I change a new one?