Drain water heat recovery seems like the best efficiency boost for water heating. Completely passive, 60% extra heat energy. At least for cold climates. Heat pump water heater might be phenomenal in a Phoenix garage.