I am coming at this from a different perspective, but it may help. We adopted a scared fear aggressive cocker, and with the help of a good behaviourist/trainer, we were able to go to classes to help her learn about other dogs. She now has two dog friends, but that took almost a year to happen, as she is very reactive. I don't worry about her mixing in, she is happy with just us, and if that is all she ever does, fine. Baxter has had a fright, and I would take it slowly with the help of a good positive reinforcement style class and trainer. There are so many ill mannered people, who seem to lack basic common sense that things will happen. But if you have the confidence to cope with that then your life, and Baxter's will be so much easier. I felt the classes were as much for me (probably more for me) than Daisy. Take it slow and steady, and you will both be fine.