Have you tried the KindleUnpack plugin? [0] I originally used Calibre's built-in "convert" option, but I found I've gotten much better results from KindleUnpack. It gives a much "cleaner" EPUB with less of the annoying Calibre watermarking in the CSS and such.

[0] https://wiki.mobileread.com/wiki/KindleUnpack