You know, I think Flash stopped being an HM a while ago and is just a TM now. I feel like that'd be a better route to go, and just have a condition on Surf so you can't forget it while surfing. They'd still be around and required, but you could teach one to a 'mon, then get rid of it once you...