Hmmm. proposal #1 IMO.
I say let them make restrictions on engine size and aerodynamics, perhaps even BHPs. But the more flexibility and room for manuevering on the tactical level the better.
Let them fuel and refuel again and again. Let them change tires, heck let them change underwear ten times a race.
As long as we get more excitement on the track and in the pitlanes