I prefer your version (with a ' in hadn't, of course) However, cue words like "since" or "after" let you know the sequence, so you don't have to rely on tense to tell you.
New words, one handy idiom, and a 2-minute quiz — delivered to your inbox to keep your streak alive.