If I buy 2 new hot water heaters, 1 as a buffer tank and 1 to be powered for my Geothermal install, can they be included in the tax credit?
Yes, energy star rules specifically name storage tanks as part of the system. Tax credits follow energy star inclusion criteria.