When I think of a witch, I usually think of a Hag, so maybe you can reference your custom witch against level appropriate Hags to use as a baseline.
In regards to the Fighter potentially critting and taking the witch down to half health, that's a feature, not a bug. The adventurers should get to feel occasionally powerful and sometimes that's going to happen on our planned villains. Instead of trying to fight against the players by inflating mechanics or blocking their abilities, maybe find more narrative ways to escalate stakes in the event that they punt a planned boss. For example, Hags usually work in covens of three...
First off, thanks for the hag recommendation, that looks very helpful. I hadn't even thought of that connection.
Second, in regards to the fighter- I do not consider increasing the hp lightly or simply to screw over my player. My party runs hard fights and easy stomp fests, but this one is set up to be a doozy. I'm not trying to write an essay on our table, but I'm trying to set this up to be enjoyable for everyone, and they're looking for a deadly encounter here.