Is there a recirculating pump on the unit? If so, it could be failing. If not, perhaps the anode rod needs to be replaced.
I would have initially guessed that it was the heating element but since you replaced that already, it could be that there is sediment in the heater and flushing it could...