Include fixed block of 5 questions after completing streak of 8/10 (addressing #2168)

See description at #2168, which this solution follows fairly closely.