I was thinking that maybe since you were running out of time, make the mains 7min (or leave it that way it is, but instead of 5min qualifiers, make them 7min with 2 heats and a main as I know for a fact that you will never get 3 heats and a main in when starting races at 1, unless you had lights around the track).