Next time try an anneal, then 3 normalizing cycles or you can Risk refining the grain to the point that it won't harden. If it's warping after 3 normalizing cycles something is wrong with the procedure, most likely the temps being too high. The wrong quenchant can also cause warps.
Next time try that out and if that doesn't work I'm stumped! Lol