The ability to use both a Z_MIN_ENSTOP and a Z_PROBE is supported in RC-3 (Release Candidate #3). It is a little tricky to configure. Be sure to read the directions and work carefully. If you are going to use that branch, you are best off using: https://github.com/MarlinFirmware/Marlin/tree/RCBugFix That is the same thing but with some carefully thought out bug fixes.

With that said, if I was trying to do what you are saying you want, I would use https://github.com/MarlinFirmware/MarlinDev/tree/Jan20 That has a number of nice improvements to the Z-Probe and Z_MIN_ENDSTOP and the two work nicer together. The only downside, is you will need to read the Wiki over at MarlinDev to get the tools configured to build the firmware. [This branch is where I'm doing all my work. It is very stable and cleaned up.]