Maybe Pokemon in X and Y can have a fifth move slot ONLY for Hidden Machines (HM's). This actually would be useful because you would be able to save the good strategy moves that you already have (Note: The fifth slot for the Hidden Machine can be used in battle if it were real).
They need to make the HM"S key items, like rock climbing gear, surf should be a canoe, rock smash; the player should get a drill, Cut; player should get a sword etc. PROBLEM SOLVED!