Great story.
The rat scene was done well. Instead of closing with the question, I think it would be better if Harry absentmindedly recommends McGonagall to change into her cat form if she ever has rat problems again. Else it might be a good start for the next chapter.