The problem here is that a story from the Book of Exodus is retold in the Book of Numbers in a totally different setting. Here are the relevant verses and here are the relevant maps: Kadesh Barnea, Rephidim.
Here is a single map to illustrate the distance between these two regions and cities:
I've not yet found any harmonies of these two stories, but I'm guessing that some apologists will fall back on "nearly the same story happened twice" as we've seen in gospel harmonies. Naturally, I'm hoping for a more creative and interesting solution.