Oddly, I wasn't bothered by the big reset button because it literally was a big reset button.
And it wasn't.
Not everything reset.
A much less subtle non-reset is that there is a high probability (in my opinion) that the Doctor remembers everything that happened, most significantly the result of the aggressive questioning he gives Clara on the fake cliff, about who she really is (he finally seems to believe her assurance that she is real). As a Time Lord, he should be aware of such temporal rewrites. (this ability has been established in episodes of both the new and classic series)
In this episode, at the end, he mentions two days crammed into one, indicating that he was aware of the first version of events.
So even if Clara truly forgets everything, the Doctor will still remember, and so the episode is not necessarily a reset from a character point of view.