I explored setting it up a bit, but haven't fully moved everything over. I have always worked via HTML paste (we use an internal template system and then I export the HTML and tweak as needed). Content builder looked cool, but these issues worry me too! I hope someone else has insight. Have you reached out to your rep?