If this helps, I'm 30 underbust with 34 1/2 around bustline and I use the mediums. You'll probably be fine with mediums or MAYBE even large since you're underbust is bigger. the mediums sound safe to me though.
Breast Nexus is a participant in the Amazon Services LLC Associates Program, an affiliate advertising program designed to provide a means for us to earn fees by linking to Amazon.com and affiliated sites.