Not so sure. I think the engine deal was long on purpose, probably to please the engine manufacturers...problem is, only Merc is now pleased.
All I can say is that the FIA is one of the best demonstrators of the laws of unintended consequences. Every effort they make to save money, or enhance the sport seems to do the opposite.
I like that the FIA pushed for the creation of a new, efficient 'power unit'.
I even like that they have rules about how many can be used in a season.
I don't like that it's locked down, so that a mistake is basically compounded over 5 years. Teams won't use a faulty engine any more than they have to. Why should they? I appreciate the logic behind not having an 'engine arms race' to keep costs down, but there's got to be some sort of middle ground for advancing the engines without skyrocketting costs.