Bah, I spoke too soon - the epubs created by my workaround (filtered html, zipped up and imported into Calibre to be converted to epub) then fail validation at
http://validator.idpf.org ...
Back to square one.
Looks like my only option is to go from docs>epub, and accept that Calibre is ignoring some of the images. This has been a very frustrating few days!