What you did sounds OK for L6, but, isn't quite right for M2. M2 really requires a more sophisticated heat treatment (temperature and soak extremely critical), and, a higher tempering temp that you can get in your oven. You didn't mention how you hardened the blades initially, or what hardness they were prior to tempering.
As for the L6, once the blade is at temp, you can cool it any way you want (cooling rate not important), but, most will recommend allowing a slow air cool.
I'd multiple temper, also. Always a good idea for any steel.
Good Luck,
RJ martin