I think you can deal with it if you work on it really hard NOW.
All mine does is wiggle herself to death when she sees someone. She thinks the world is hers to hug!
I wish for you the same that I have in Kacee. The only thing that scares Kacee is when kids start running toward her when they see her. She gets ready to go the other way.