Quoted By:
Here's how I'd handle HM's if it were up to me.
I'd make it so that every pokemon can learn five moves; Four active, one reserve. The reserve move wouldn't be usable in combat, but it'd be usable in the field (if it's a field move like fly, surf, etc.)
You can swap in your reserve move at any pokemon center by talking to a particular NPC.