What you may wish to do is try heavier weights. Don't go crazy, but those same discs, in a 167-168 range would help you with control. You could even consider a 170-172 putter weight and work on driving with it. After some adjustment and practice, the Leopard should go over 300+ no problem. Keep it simple, you don't need 20 discs.
But to answer your wind disc question, a Teebird would be a nice addition. It will handle some headwind (especially at your current distance) and become a staple main driver in your bag for some time.
I would stay away from very overstable discs right now. While they do handle the headwinds very well, they can also hide form/grip/release issues that will hurt you down the road. Focus on good form and distance and accuracy will come.
BTW, the Teebird-Leopard combination is a popular one...