I agree with the above answer. Portland Pet Supply are incredibly helpful and probably have what you are looking for. I do believe you will have greater success with training. I had a similar situation with my dog. I took her to Kindred Dog PDX. She is much easier to deal with and much much happier. She doesn't have all the nervous energy anymore.
I am not affiliated with this shop but have shopped there. They are helpful. If you have a question for them you should probably call them. In my opinion though...Sounds like you might benefit more from desensitization training to get your pup to learn how to react in an acceptable manner. I would suggest looking for behavior training that will help stop the reaction from being a problem or cause for stress for you and your dog. Hope this helps. Good luck to you and pup!
Thanks! Your answer is awaiting moderation.