Stev32k, Qwakalot, Vanya,
Thanks for the suggestions.
I'm glad you were all here, otherwise I'd still be sitting in the yard staring at the heater. (well, maybe. At the very least I'd be wasting a lot of water.)
I think I'll start by opening up the outflow on the heater, see how bad it is from...