I like all the suggestions but I also really like the idea of an indirect tank not needing another gas or electric hookup. No moving parts, burners, coils, etc. to worry about. It just utilizes my existing boiler and will give me more consistent hot water. At least that's where I'm leaning.