Also, the whole Teddy and anti non-wizard bit was added to have an external public plot line congruent and helping to motivate the internal relationship changes. Harry's decision to get involved was the resolution to his internal struggle, but I left the public part unresolved to have something for them to do in the sequel.