Formula 1 agrees a two-step plan to change engine design in response to criticism of this year's new rules.