I think the pain may be coming from the hypomobility of the ribs.Try to mobilize the ribs.
I also had a patient with the same problem and I treated him with rib mobilization,he was fine after 2 sessions.