protect servo from stall current

You need to measure the current the servo is pulling and implement a cutoff - or find a more sophisticated
servo that does that itself. A shunt or hall-effect current sensor module perhaps?