Hello Glee I'm an English learner from Japan and I think as an English learner you are more advanced than me. But let me try to your question. I think both of the sentences you give have no grammatical problem.
New words, one handy idiom, and a 2-minute quiz — delivered to your inbox to keep your streak alive.
It will not be long (before/until) he comes back.
I think 'before' is the right choice for this sentence.