Comment by ip26

Have you heard of drainwater heat recovery? One of the side benefits is dramatically improving the recovery rate of your water heater.

(Unfortunately it doesn't work well with certain plumbing layouts, and the rising price of copper has reduced the cost effectiveness)