Said this before in another thread .. Check the outlet elbow to the heater supply pipe is not blocked up by scale. You may need a drill bit and/or wire to do this.
I found two like this, both CVH engines with angled elbows.

Good luck anyways