I Just wanted to give an update. I bought a new water heater. I went with the Bradford White 47 gallon tank. I found a supplier to sell it to me without installing it. My father-in-law and I installed the new tank without any problems. The new tank is putting out enough water for 2 showers in a row. We have not had to try 3 showers yet, hopefully it will work. Hot water problems are fixed for now. Thanks for all the advice. This is a great site.