Wait...
I seem to remember from the version I played from two or three years ago that you added an ingame item, or was it just flavor text (?), that explained how you could use Cut, Strength, Dive and Surf without the need for any Pokemon actually needing to learn the HMs. Or did I just dream...