Hi Tracey,
Definitely you want a formula that regulates peristalsis and, if EPI is present, has an anti-inflammatory effect. If the tongue tip and behaviour are any indication, then a calming and cooling effect on the Shen (psyche; Heart) is also indicated. This puts me in mind of San Ren Tang.
In addition, I like your idea of Xiao Chai Hu Tang (Minor Bupleurum Combination). I've found that it can exert a powerful 'high level' or overall peristalsis regulating effect that allows formulas with more focus (e.g. WLT, SRT) to work better.
So I'd use the two together and see how that goes for you. I've had similar cases do well.
Good luck!
Steve