Have you already tested Young Pyromancer?
I think it would be a good addition to that. And what about forked bolt?
How often have you good problems that stifle get countered and you lose 2vs1 ?