Agree. Actually I find that the Berlin mode (aka EDIT PERFORM state) is what I always wanted the EDIT state to be like.
So may I propose, that the new EDIT PERFORM state (Berlin) takes the place of EDIT state, and we go back to having the EDIT button switch between two states. The old EDIT state could be reached by holding some other button while pressing EDIT.
How do you like that guys?