>>15657000Just do this.
Keep the moves for battling, make non-pokemon HM moves available to you.
To keep everyone happy, let people choose whether they want to surf on their lapras or on a raft, choose between flying on their pidgeot or on a mini helicopter or whatever.
If they ever forget the pokemon HM moves they can just do it with their HM devices.