The changes to Email Templates are significantly harder to work with

We’ve just upgraded our production environment so this feedback is a bit behind but the changes to Email Templates have made it 10x harder to produce emails now. Any changes to the code are overwritten once saved. I cannot format anything in the code the way that I want to, and every line of text is now a p tag.

I’m curious if any other users are struggling with these changes well.