The new Demoknight is a complete counter to the pyro. More powerful weaponry, and if you charge you get either contact or a crit, at the least a closer. If he punts you back, you keep your charge meter now.
Then, once he dies, you regain your health back by picking up his flamethrower...