You could try 2 stage quenching where you would use water to quench the steel for a short amount of time, then using a second medium, such as oil, to finish the cooling. Using this method will reduce the risk of cracking or distortion. Also, agitating the water will help cool the metal faster.