Was running out of hot water before even drawing a full bath whenever no hot water was run for 6-7 hours prior. Got a JMan plumber replace dip tube. When that didn't help, replaced the entire tank with a gas-heated 50-gallon one. Still having the same problem. He already inspected for any possible cross-connections and ruled it out. Help!