The order of the lead screw definitions should match the order of order of probe points in the bed.g file.
Actually, the order of the probe points doesn't matter. But the order of the leadscrew coordinates in M671 must match the order of the corresponding Z motors in M584.
That's correct, create a new axis (e.g. U or C, it doesn't matter which as long as you are consistent) for the extruder angle control using the M584 command. If you need to home it, connect the homing switch to the E0 endstop input.