So, from those charts, for EF / SS the choice between haste and mastery is largely irrelevant from a pure hps standpoint. The difference in numbers is small enough not to matter. The difference will be in the other tangible benefits. Mastery will still allow you to spam heals for shields on stacked fights. Haste will allow you to be more reactive.
I'm still stuck for a decision on 10s. I think ultimately I will have to try both mastery and haste and see how they work for me personally.
Out of interest what is the HS cooldown at the top haste level you use (I'm assuming you're using raid buffs etc that will need to be discounted)? The benefits of a short cooldown HS in 10s aren't reflected too well by simple hps. Even now I find myself waiting on the HS cooldown half a year after I lost the set bonus. If I would get even close to 4 seconds again I'd jump at the chance.