I think you figured out your what you have (in my opinion). Now the question is not what exercise you can do to fix it but what caused it in the first place. Decline bench was the culprit for me. Didn't you say a dip motion bothered you; close to the same motion. I always had a feeling like "Man, I wish it would just crack like my back does"
BTW, doesn't go away over night!