Welcome to the forum.
I currently teach conversational English so I don't have a structured way of teaching those forms. However, when I taught formal lessons I always taught them separately to avoid confusion.
Please note my corrections above. Also, please check your member profile. Your current location does not appear to be Luxembourg.

English Teacher