i had this same problem but i have gotten used to it lately. you’ve learned dvorak so just remember your body will get used to anything, it’s just time.
i have also stuck to using the stock locations for keys (i.e., escape) and i’m getting used to it even in vi. i am really appreciating taking some of the work away from my pinky whenever possible. but i think that i maybe his escape with my thumb. anyways, good luck.
ps, i do think that enter is in the correct spot. because you don’t actually hit enter that much and if you do it’s some n times in a row; so when you move your hand you can get one or more taps out of it before moving all the way back.