How's this for better tankless water heater use

If the water heater can't be made serviceable and you wish to jury-rig a solution rather than replace the heater, I'd suggest to use one of the portable "camp hot water heater's" and establish a loop into your hot water piping.

There was a thread on the Forum not too long ago where someone did this and provided enough hot water for a dozen people using the shower facilities.