Do you have eeprom settings enabled? It sounds like perhaps you have a conflict between your firmware and the eeprom settings for your Z probe. Try running an M502 command followed by M500 to rule it out.