Alan,
Having reread some posts you gave an input pressure of 14" as against 14.8", are you able to measure the actual burner pressure and compare with the manufacturer's spec??. If this is down by the 0.8" or very close then changing the diaphragm probably wont help as the gas valve must be fully open.
If you have a regulator and can pipe so you have the full 14.8" at the inlet and try rating the appliance again to see how much difference the 0.8" will make.
The actual burner pressure is the governing factor in the heat output of the appliance and is the one thing to get right before looking for other faults. On these type of appliances the inlet pressure can directly affect the burner pressure at the full gas rate. If you get the inlet pressure right then if the burner pressure is low then look to the diaphragm or gas valve. If the burner pressure is ok then you will need to look at the heat exchanger.
If doing the above is a pain, then a tenner on the diaphragm wont break the bank, and may save some work with the above and do the trick. If it doesn't the do the above.
Feeding the Morco directly from a calorifier would be a no no, as if the engine had been running all day the calorifier could be around the 80deg mark and another 25deg would give you a steam shower-ouch!!!
However as suggested feeding from a thermostatic blending valve set to 25deg would give you around 50deg. Although why use gas to heat the water thats already heated freebies????
It would I suppose make the calorifier hot water last longer, if there are a few aboard for showers.
Good luck
Dave