I checked a bit more route over the weekend. This now skirts the north of Droitwich rather than barreling right through the town, and is a better ride for it.
This might mean NO FORDS this time, but I can't quite remember where they sat on the old route so I'm not yet sure. There is, however, a honking great new ford right by the new control at Broadwell. You'd be mad to try and ride through it, but no doubt* some fool will.
*hopefully