The hot water gets warmer but not as hot as it should be and not as hot
as the central heating radiators, it seems the diverter valve is still
not diverting most of the water?

Turn the heating off. Let everything cool down. Now run a hot tap with the
CH still off. Do the rads heat up?

Christian.