Hedwig could hunt; I think she would have been fine. Or she could have stayed with the Weaseleys or something.

It smacks very strongly of deus ex machina to me. I think the final draft needed a few more rewrites, but I've thought that of most of the series in the first place.