What Mastery Designs are Being Worked On? (Outside of SotA Change on Pre-Season Site Currently)

• Part of me was thinking that Stormraider's Surge was going to get replaced/reworked; it was always my feeling that the Keystone could not compete well with the additional damage brought on by Thunderlord's Decree. Has that been considered?
• Has there been any consideration to putting similar masteries within the same tiers? (e.g. how Opressor and Bounty Hunter both have damage increases but in different situations, and you have to choose which of them to take based on champion/team/preference)
• Any thought on making the 5-point masteries just have one rank, and reducing the amount of mastery points in total? How prevalent is it to actually distribute your five points across both options, without maxing either of them?

Totally understandable if this info can't be divulged yet.