If the engine overheats before the fan kicks back in, I'm thinking the fan clutch is bad. I've never heard about the "fail to lock" deal...