Yeah. I'd prefer they tweak the existing AP system rather than throw it out.

If you're just barely out of range of an enemy and you have to take just a couple of steps to reposition yourself... Well, it shouldn't have to be a big problem.