Look at your diagram and then look at the one below of a HH location. The pain location looks very similar doesn’t it? It’s sounding more and more like a hiatal hernia could be your problem to me, or is the location in the diagram below too high and too close to the center? Hard for me to tell since I’m not experiencing the pain.
If you think the HH is your problem, I think the massage is a fine idea.