When editing an email template, have "Save and... Edit" be the default in the dropdown. Not "Save and... Finish"
In the 4 steps of creating an email template, the 4th step is "Save and..." with the dropdown choices of Finish, Mass Email, and Edit in that order. So Finish is the default, and Save and Edit requires two steps (select Edit from the dropdown and ...