I made almost the same exact deck and, while I thoroughly enjoyed it, I ultimately decided that there were too many Stage 1 evolutions to make it function properly, and Haunter didn't prove to be overly useful for me.
I ended up dropping Gastly for Phantump and popping in Gengar EX. Trevenant...