I could definitely be wrong.
Sorry, but you are.
Home Slave with Master should only be checked if using
ONE Switch for two separate motors.
And yes, it should work if you just add one switch (with it's own input) to your existing setup. You may need to separate the XA homing from the Y (and Z), though. You'll need to test to be sure, although it should work fine as is.