Instead of mastery resets, I believe he could just allow players who chose mastery combos that don't have an advance to choose between their 2 masteries to advance in. For example a fire medic could choose between advance fire or advance medic and so on.