Keep in mind when you are prescribed with the more popular, short-term effective benzodiazepines (like Xanax or Ativan) you are more or less signing up for some very unpleasant symptoms that develop when you taper and/or stop medication after prolonged use. Namely, as mentioned above, Xanax and Ativan are geared for panic attacks and short-term anxiety relieving solutions as opposed to your Klonopin dosing. I wouldn't mention this if it didn't hit home, a friend of mine was prescribed Xanax and Klonopin by several doctors and long story short, he developed a life-struggling benzodiazepine withdraw syndrome that put him in the hospital more times than he would admit...not to mention suicidal thoughts arising from the syndrome's complication. It is actually a bit bizarre, because my friend had the exact same issues you were having regarding needing two separate benzos for various desired effects.
You think your sleep is bad now? Wait until some careless practitioner prescribes you one benzo, and another prescribes one as well, you're hitting the fast road to personal hell. Remember that benzos main pathway of activation in the brain is via the GABA receptor, aka only the most prevalent receptor in the brain, period. This allows for more issues to arise when stopped.
If you are really bent on maintaining your benzo schedule, I would stray away from Xanax. I say this because despite its excellent effectiveness at suppressing anxiety, the potential for abuse and dependence is almost guaranteed. Ten years ago that would not have been an issue really, as you could find hoards of actual Xanax on the street for reasonable prices. After regulations changed and awareness was brought to its widespread abuse in the U.S., prescriptions to Xanax have dropped dramatically as have the street availability. People who were in your position a decade ago are now struggling to find Xanax on the street, which is a great shame because I have to be the one to tell my friends and acquaintances that the press and ingredients in their street Xanax pills are predominantly bunk. I actually haven't seen many people selling Xanax (real Xanax, plenty of people sell these rugged pressed bars that anyone who has ever taken one would recognize in a split second) anymore because of the cut-down by the pharmaceutical industry. You definitely do not want to be that 'guy' who has to score benzos from the street, because all-around thats a losing game unless you know someone who sells their script.
Klonopin is effective in my opinion, but as you are experiencing now, you have to keep readjusting (upping) dosage. As my friend experienced, this will eventually come crashing down on you; of course you could taper, but when the day arrives it will be your responsibility to use accordingly (it won't be easy)!. Of course, there is always the ancient Buspar for GAD, but the effects for individuals who have been previously prescribed benzodiazepines does reduce the effectiveness, according to studies and patient experiences. Valium, at this point in your benzo career, would be relatively moot, being that Klonopin is already the forerunner in that department.
I heed the part where you mentioned you would rather remain in the benzo department, but the new perspective on anxiety and GAD is that is closely related to general depressive disorders, so the treatment can serve both purposes. Definitely worth checking out the newer Serotonin-Norepinephrine Reuptake Inhibitors.
How long are you planning on using benzos? Do you really want to risk taking two separate benzos with slightly, varying possible long-term side effects? This will take some research and personal decision making on your part to weigh the benefits of taking the medication to curb your anxiety and bouts of other mental issues. I would definitely hold off on getting two separate scripts, mainly because it's not recommended, but mostly because it spells more trouble in the long run. I think you have it good with your Klonopin, but I would speak with your doctor about the future and whether he will accommodate dosage changes over time (most doctors do, but some won't). As far as you mentioning bipolar, from personal experience you should be on some kind of medication