A suggestion, in many hacks I've seen there's a system for HMs in which you don't need to teach the pokemon the move, you just need to have the HM, the necessary badge, and a pokemon which could learn the move.
I think that'd facilitate for us players, not having to actually cut moves to include...