I tried this again today 3/6 ... the Heat pump Water Heater credit is now added to total of Home Energy credits. Looks like its fixed.
