If you set a class for the pictures with CSS that had something like
.photo_left { clear:left}
and a class to clear the float, something like
.clear_floats {clear:both}
This would give you flexibility as you could also create a class for .photo_right. You could then choose to use the .clear_floats class when you want the effect of wrapped text (or not.)