I think races should have extra laps added on when there is a safety car. Think of injury time in football but instead for f1 you use a certain factor to determine how many extra laps you add on depending on the number of safety car laps. I think this wil add more drama and a "reverse strategy" to the races when it comes to fuel and tires. The downside is if we keep these fuel rules the drivers will not have extra fuel to push with since the car has to drive further.
For example:
Safety car laps > extra laps
4 > 3
5 > 4
6 > 5
And so on.
This way we get more laps of racing.