[ziltoidto]

>I've spent countless hours fighting against the layout >algorithm to get images to go in the right place

This probably means you were using it wrong :) LaTeX almost always knows better than you, and you should trust it. You are much better off "guiding" the image placement rules than trying to set them manually!