I've got some more info on my ongoing problem. Maybe someone can offer advice.
As mentioned before the new diverter valve did not help.
I believe the water is being overheated and the boiler is shutting off. The dial on the boiler shows the water being heated up to at least 99, even with the...