@
AndyAitch - Can I suggest you look at the support for DOCX that was recently added to Calibre - my experience in converting to ePUB is that it's considerably better than Filtered HTML, RTF etc. I think it will address address both of your issues - caveat I mainly convert to ePUB.
There's a sample document here
http://manual.calibre-ebook.com/conv...-specific-tips that provides some guidelines.
BR