So after rebuilding the pedal, the damn thing came off while I was riding along Lambton Quay. I was quite lucky there was little traffic around.
Once home I recleaned and then regressed it again, but I will be paranoid for a while, although it seems to be much better than it was.