You could always teach the Pokemon the HM move again, yes? I mean, they can be used an infinite amount of times. Being able to delete the move with, let's say, a desired TM and then realizing you need it again would not be a big deal. You could replace the TM with the HM and if you wanted to...