You could change the rules to improve it, I suppose. Among heavily armed and armored people, though, I think the whip does not rate as a weapon. I’m not sure it was ever used as such. While you could wrap a whip around a weapon and then struggle with the person holding it, I think the Zorro-type disarm comes from striking the bare hand of an opponent with precision. Anyone wearing armor probably has some protection there. Also, such pinpoint called attacks are not otherwise part of the D&D approach to combat. You can’t throw a dart into someone’s eye, for example. At least, not routinely.
I guess I am arguing to keep the whip in the torture chamber and on the ship, rather than power it up to become a weapon suitable for armed combat.