We now have a points system that pushes the drivers to be fast all the time.

I see nothing wrong with that.

The rally winner is on total time, the points to the ones who win stages.