AC Joint

During a soccer match in April of 2004, I suffered a level II AC Joint while colliding with another player at full force while going for a ball. In about a month after doing rubber tube excersices to stregthen the muscles around the joint, I was back playing in goal again with no problems and my full range of motion back. However I still have a problem with it whenever I dive and land on it or if I have my arm extended and get hit by another player while going for a ball in the air. If I if have my arm fully extended out and land on the ground like that, sometimes I hear like a popping or tearing noise and I feel like I aggravated the joint again. After about 4-6 days I would be playing again with no problems until I landed on it again. This has happened twice in the past 2 months and it’s gotten to the point where I am worried about it when I play. My question is, what, if anything, can I do to get the AC joint to how it was before the injury and would surgery be an option at this point?