1,2,3. Your formulation is fine. It depends on the student's level, of course. I wouldn't burden a beginner with the fine points of tense usage in dependent clauses. Your formulation does leave out, however, the parallel formulation for the past tenses, including the conditional (with "would"...