Fit text within area

In my logs, I have an area where the Geologic Name is displayed.  In general, the space is big enough to handle the name, but with thinner layers, the assigned name does not fit properly, and it overlaps text from the next area.  here's a pic.

In this case, both the Oketo SH Mbr and the Ft Riley LS Mbr are larger than their area.

Currently, I'd save these as drawings and adjust the size or the number of lines.  Usually, I would go with a wrap first and set it to two lines. 

What's the best way to make it fit?  I don't want to shrink it too much, lest it become unreadable in some cases.  I think wrap is the first option.  I don't mind if every name is wrapped, so if the Florence LS Mbr, in this case, turned into two lines, I'm ok with that.  I think the approach would have to be two-fold, in case a wrap didn't work, then the size would have to get an adjustment.  I do think a wrap would solve 90% of the cases I deal with.  There's always going to be the random exception, which requires hand-editing.

How can I go about this?

Thanks!

Jeff