I don't like either of the choices.
I would use one of these:
Richard is expected to return in January. By then, everything should be ready.
Richard is expected to return in January, by which time everything should be ready. - Not great, but better than "by which"
Richard is expected to return in January, when everything should be ready. (Your suggestion, which was good.)

Student or Learner
Bookmarks