Wouldn't a mixture of the 2 work out? You use the current method when levelling and when you hit max level the other takes over. Then when a expansion hits with a level increase it switches back until max level is hit once more?