They should just change the penalties to count towards powerstage times on sunday. That way they count towards general classification as well. Problem solved.