I've cracked ribs in the past, and the only thing that heals it is time. Agonizing time. Try auditioning on a trumpet with cracked ribs......not fun.

One of my coworkers dislocated a rib, and went through something similar to what you're describing, he wound up making several chiro visits to get it taken care of. If I remember correctly, it took him about a month to completely be free from pain.