energy cost of waiting should be same as walking
At least, I think so. YMMV.
It seems more intuitive to me that it behave that way, but it also robs the game of a slight, if very 'gamey' element of strategy, where I waggle side-to-side as enemies approach (to take advantage of slb/stilts/long stride) to eat as little energy as possible and maybe land an extra hit without penalty. But in the end, that's weird behaviour, and simply waiting on a square should do the same thing...