A faster way to purge the air from the hot water heater is to pressurize the system (with the pump or city water) and open the water heater relief valve by pulling the spring loaded handle. You will still need to purge some air using the faucets, but you won't get as much splashing.