Agitate the steel in the oil during the quench, this reduces vapor pockets and gives a more even quench. Pull the blade from the quench after about 8-10 seconds. If it flares up or smokes heavily put it back in immediately for a few more seconds, but if it simply wisps a little smoke you have a good interrupted quench that will slow things down as you start Ms that will reduce warping and wavy edge.
The steel will be dead soft and malleable on the way down at 500F. You're safely under the nose, but martensite (the hard stuff) hasn't really started forming. This is the sweet spot where bends can be straightened by hand. In fact it is so soft you need to be careful not to over do it. Once it starts to "set up" you need to stop.
After that it is still possible to correct bends during tempering. You clamp the blade slightly over compensated then run your temper with it sprung. This will frequently move the steel without really stressing it.