More...
So, I've been searching my memory for how things are set up, and it occurs to me that not all M25's in C36's are plumbed the same. When I got mine, it was in what I think was original condition: the water heater was plumed into the thermostat bypass loop, and there was a bypass valve across the water heater loop.
The domestic water took forever to get hot.
I changed it several years ago, plumbing the water heater into the thermostat housing to exhaust manifold jacket loop, with a bypass (shunt) valve. (I think - I'll have to look at it again). This has seemed to work well for years, and the domestic water heats up much more quickly.
So, I have to ask - how is yours plumbed?