In general, I would split the current volume of basic education into smaller subjects (with many optionals) and finer levels, and have students to make a choice how fast they want to complete them (as long as they would work towards one of these goals).