How about the power stage as the last stage on Saturday? with 3,2,1 points. On the Sunday have a joker points stage among the last stages. The stage that counted announced at the podium 3,2,1 points. The drivers would have to drive the Sunday consistently and not save the tyres/ effort for one power stage.