Yep. Most of the time I don't even end of using the masterball. Anything is obtainable with enough effort, even the roaming legendary pokemon can be trapped with mean look. I only keep the masterball in case of a shiny pokemon.
I'll trade HM Fly for HM Surf.