Having a modifier button to use when entering "berlin" EDIT mode would seem to work better, that way the mode doesn’t interfere with the workflow we have grown accustom to.
Thanks ripe for chiming in. It is good to hear that I am not the only "old" user who is not happy about the extra mode. "Too much thinking" is exactly how I feel about it. Your idea about using a modifier button to enter "berlin" seems fine.