The P0 you have in M558 indicates that no Z probe is present.
So it should be P4 for a switch? I'll give that a try.
a babystep of 0.3mm upwards and the print was going fine, i tried starting the same print again and left the 0.3mm baby step in, interestingly I had to increase to 0.6mm for the print to start, a 3rd print and I had to increase to 0.9mm for the print to start, in reality it was just the original 0.3mm I was babystepping and assume it just a display thing, I restarted my printer from cold and happily only had to babystep the 0.3mm again for my print to start
I have this same phenomena. Also baby stepping before the print starts (preheating), does not have an effect, I'm guessing because homing resets the baby step value, but the displayed value remains.