FSSH-2: Fewest Switches Surface Hopping with Robust Switching Probability