>>47757009Keep them as they are, but make them removable, and add optional, hard sidequests that have you make use of each HM individually, and reward you with a key item that replaces them by the end. You can even make the player use only the pokemon that knows the HMs, either for extra challenge or to make it feel more special, as it will be the last time your pokemon is gonna use them.
Final sidequest is the Surf one, and includes all the Water HMs in maybe a dungeon, or something