I'd like to add a word of support for #4 and #7.
In a past tense narration, 'until X happened' means that X was a surprise or a change.
The flight was perfect until we hit that turbulence.
The flight was miserable until the flight attendant smiled and brought me a cup of tea.
The flight was routine until the missile attack.
The flight was very good, and when we touched down, everyone applauded.
The flight was ideal, from a smooth takeoff to a light landing that drew general applause.
If the beginning was positive, and the end was the same or better, the connecting word here should show addition or completion, not contrast.