How about all stages are PSs, and overall winners get bonus points?
This way drivers need to compete from start to finish non-stop at max.