What is the optimal arrangement of pokemon so that I can have ALL available useful HMs and Field TMs with me at all times using the least amount of party space?

Right now I have a Pancham (Strength, Rock Smash, Cut, Surf) and a Fletchinder (Fly, Flame Body [egg hatching])

I'm coming up on the area where I'm going to need waterfall and I need to readjust my party.