Good game! I rather suspect Umbridge is going to regret dispensing with his services when/if his true nature becomes known. That last scene was a nice cliffie as I suspect the new phoenix is going to be a very peculiar member of that already peculiar race.
Shyamal is going to bite her in the arse good and proper. Eclipsis will have his uses.