Sounds like you've got most bases covered.
When I think that only 100 yrs ago most places only had an outdoor hand pump, often shared with other households, with only cold water, and heating water on open, or coal fires. long drops for other needs. It makes me grateful.
We realy have it so...