Ok, I solved this myself, bottom image is correct, and the polarity matters for the BL touch endstop function.