Might I suggest a Scizor over Hitmontop?
Scizor hits Terrakion and opposing dragons(as well as landorus) harder which are vital to get rid of if Salamence is to sweep without getting revenge killed instantly.
The red bug would also help against Gengar a bit unlike Hitmontop, who is basically a...