Have you tried see if you can set the output temperature of your heater higher? Could be the output temp of the heater is very close to “shower” temperature, and a lot of heat is lost heating up pipes etc, something that could be sped up by increasing the heaters output temp, or improving the insulation on your hot water pipes.