I've just arrived home from church and the safety switch has remained OK with the water heater running now for at least 10 hours.
The water in the kitchen sink is warm, but not hot.
Water to all other spouts is hot.
I have closed the by-pass line to the pump, as I just noticed that it has been open the whole time.
The water coming directly from the bottom of the heater must now pass directly through the pump if it is to leave the closet where the heater is at all.
Hopefully, this is not a mistake and will help get hotter water to the kitchen.
I may also try to nudge the setting up a little bit more since the reset switch did not kick off.