experts please help..
Unfortunately, there isn't much help to give here. This one is purely idiomatic. "It wasn't until..." takes "that," and not "when," for not grammatical reason other than convention.
Prepare with Kaplan and save $150 on a course!