First, this is wonderful. Unlike the Harry whose incredible potential Rowling wasted, you're actually turning him back into the badass he was becoming fifth year.
Second, yes I saw that episode. It was almost as funny as the 'Trapped in the Closet' one where they ripped on Scientology.