A new release of Cocoon-with-eXist-as-block came out today, so I spent the morning producing a working cocoon-2.1.10 with XEP and all our customizations. Everything seems happy. I've also adjusted the root sitemap to provide both XEP and FOP use. Calling fo2pdf will use XEP, while fop2pdf will call FOP. This has been tested with the Scancan data and is functional. FOP seems to be much better than the last time we tested it. Still not great, but better.