>>22783221I would reduce the number of HMs by turning them into TM's.
What should remain an HM: Surf and Dive.
Here's why: you don't want to be surfing and then suddenly remove "surf" from your surfing pokemon's moveset. Same with Dive. Those are the ONLY two HM's that remain in constant effect while in use.
What should become TM's: Rock Climb, Rock Smash, Strength, Waterfall, Cut, Flash, Whirlpool, Defog
If you went up a cliff with rock climb, grew a level, and deleted the move before going back down, you can always just re-teach it.
I know some of these have already become TM's (i.e: Flash) but I just decided to give the comprehensive list of HM's and former HM's.
I'd also remove fairy-type.