Looks like a good space you have there. I would move the water heater out of the garage all together. You plan on having some work space and a gas heater pilot light is just asking for a reason to cause an explosion,especially down near the floor level. Fumes from gas in the car tanks, paint...