Keir - Yes, that sounds a sensible move responding to how the body is reacting. I'd rather see the 21 miler being kept in than be too concerned about the faster end.
With the faster work it should really feel as though you're leaving it all a little bit too late. The reason being that the training adaptation response to sessions like the progressive 10 milers and fast finishing 22s is actually quite rapid in the overall scheme of things and as such there is more risk of peaking too early than not being ready in time.
Minni - Altough I am always keen to defend race organisers, especially from running clubs, I have to say that the justified line of 'remember we're just volunteers and are as disappointed as you', while being very true does start to be a bit less easy to accept when £40,000 of entry fees are involved.
What really surprises me is when races cancel and then say that they are going to have a meeting to discuss what to do about it. It is as if weather related issues in winter hadnt even crossed their minds. 