Those expecting parts from me...

I would vote for replacing the elements in the heater, less as said it's pin holed or something no need for a new one. Also, could it be taking longer to heat up because clogged faucets or is it like that on all off your sinks/showers?