Or you can have "mule" Pokemon that have 2 or 3 HMs each and switch them on occasion. I know, still irritating, but better than having your main Special water type having Waterfall in its arsenal. Definitely one of the things they Game Freak needs to improve on future 'mons.
My themeforest portfolio: