layout for ePub with inline objects

I've run into a layout problem while trying to format a book length document which includes about 20 images.

Originally, I had used floating objects and just messed with it until it looked okay. Now I want to export as ePub, therefore objects must be in-line.

The first approach I've tried is to insert layout breaks before and after the image, then create two columns, one for image, and one for caption:

I've used 77pt spacing 'before paragraph' to get the caption to balance against picture. It sort of works, but I don't have much control over the width of the text despite playing with column widths and gutter:

As you might agree, it looks a bit hokey.

A second approach I've tried is to paste the image into text, then get text to wrap to the right. But now the caption feels as though it's jammed up against the picture.

Any suggestions as to how to improve?

thanks,