benzodiazepines vs buspar

Originally was put on Effexor and klonopin five years ago for panic disorder and GAD.  Combo worked well only after the klonopin was added.  Tapered off Effexor but stopping klonopin brought about anxiety attacks.  Stayed on klonopin.  After five years I am taking 1&1/2 mgs a day.(down from 2).  I am having difficulties with the panic disorder again and have started Celexa.  problem is my original Doctor just moved and left me with an associate.  He does not believe in long-term use of Klonopin and wants to replace with Buspar.  Every time I try to lower my dose of Klonopin, within a couple of days I'm miserable.  Also I know from work that there is a possible side effect, from buspar, of tardive dyskinesia.  I am not sure if this is a safer drug just because it's non-addictive. Permanent uncontrollable movements are scary.  Since this doc hates benzos, I am afraid i will be juggling drugs and feeling crazy for months.  What's your opinion of the long term use of Benzos(especially with added insomnia) versus Buspar?